dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix/win32 build warnings (#936)

Browse Source 
* Changed win32 port of localtime to use secure OS API functions when compiled with MSVC

* Changed all the sprintf to use snprintf instead in BSC tests to ensure null string endings.
This commit is contained in:
Steve Karg
2025-03-03 10:32:28 -06:00
committed by GitHub
parent b0a26cf2cd
commit 7e725ce028
21 changed files with 317 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/linux/arcnet.c
+7 -7
View File
@@ -115,9 +115,9 @@ static int arcnet_bind(const char *interface_name)
ARCNET_Socket_Address.sa_data, '\0',
sizeof(ARCNET_Socket_Address.sa_data));
/* Strcpy the interface name into the address */
strncpy(
ARCNET_Socket_Address.sa_data, interface_name,
sizeof(ARCNET_Socket_Address.sa_data) - 1);
snprintf(
ARCNET_Socket_Address.sa_data,
sizeof(ARCNET_Socket_Address.sa_data), "%s", interface_name);
fprintf(
stderr, "arcnet: binding \"%s\"\n", ARCNET_Socket_Address.sa_data);
if (bind(
@@ -140,7 +140,7 @@ static int arcnet_bind(const char *interface_name)
exit(-1);
}
}
strncpy(ifr.ifr_name, interface_name, sizeof(ifr.ifr_name));
snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", interface_name);
rv = ioctl(sock_fd, SIOCGIFHWADDR, &ifr);
if (rv != -1) { /* worked okay */
ARCNET_MAC_Address = ifr.ifr_hwaddr.sa_data[0];
@@ -153,9 +153,9 @@ static int arcnet_bind(const char *interface_name)
ARCNET_Socket_Address.sa_data, '\0',
sizeof(ARCNET_Socket_Address.sa_data));
/* Strcpy the interface name into the address */
strncpy(
ARCNET_Socket_Address.sa_data, interface_name,
sizeof(ARCNET_Socket_Address.sa_data) - 1);
snprintf(
ARCNET_Socket_Address.sa_data, sizeof(ARCNET_Socket_Address.sa_data),
"%s", interface_name);
fprintf(
stderr, "arcnet: MAC=%02Xh iface=\"%s\"\n", ARCNET_MAC_Address,
ARCNET_Socket_Address.sa_data);
ports/linux/bip-init.c
+1 -1
View File
@@ -475,7 +475,7 @@ get_local_ifr_ioctl(const char *ifname, struct ifreq *ifr, int request)
int fd;
int rv; /* return value */
strncpy(ifr->ifr_name, ifname, sizeof(ifr->ifr_name) - 1);
snprintf(ifr->ifr_name, sizeof(ifr->ifr_name), "%s", ifname);
ifr->ifr_name[sizeof(ifr->ifr_name) - 1] = 0;
fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
ports/linux/ethernet.c
+2 -1
View File
@@ -120,7 +120,8 @@ static int ethernet_bind(struct sockaddr *eth_addr, const char *interface_name)
/* Clear the memory before copying */
memset(eth_addr->sa_data, '\0', sizeof(eth_addr->sa_data));
/* Strcpy the interface name into the address */
strncpy(eth_addr->sa_data, interface_name, sizeof(eth_addr->sa_data) - 1);
snprintf(
eth_addr->sa_data, sizeof(eth_addr->sa_data), "%s", interface_name);
fprintf(stderr, "ethernet: binding \"%s\"\n", eth_addr->sa_data);
/* Attempt to bind the socket to the interface */
if (bind(sock_fd, eth_addr, sizeof(struct sockaddr)) != 0) {
ports/linux/mstpsnap.c
+1 -2
View File
@@ -116,8 +116,7 @@ static int network_init(const char *name, int protocol)
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, name, strlen(name));
snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", name);
if (ioctl(sockfd, SIOCGIFINDEX, &ifr) == -1) {
perror("Unable to get interface index");
return -1;