aboutsummaryrefslogtreecommitdiff
path: root/src/ats/ats_api_scanner.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
committerChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
commitd8c53b12a818ff7cf82d06a1a69c395bdef85ee6 (patch)
tree0ebb0db416c157fcfde51a941185819dd12d51fd /src/ats/ats_api_scanner.c
parent5184c17d32a39c928c2a0fec3ee1ad098bbaa562 (diff)
downloadgnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.tar.gz
gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.zip
-avoid calling memcpy() with NULL argument, even if len is 0
Diffstat (limited to 'src/ats/ats_api_scanner.c')
-rw-r--r--src/ats/ats_api_scanner.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ats/ats_api_scanner.c b/src/ats/ats_api_scanner.c
index d9002a076..7015a31e8 100644
--- a/src/ats/ats_api_scanner.c
+++ b/src/ats/ats_api_scanner.c
@@ -239,8 +239,8 @@ interface_proc (void *cls,
239#endif 239#endif
240 network4.sin_addr.s_addr = (addr4->sin_addr.s_addr & netmask4->sin_addr.s_addr); 240 network4.sin_addr.s_addr = (addr4->sin_addr.s_addr & netmask4->sin_addr.s_addr);
241 241
242 memcpy (net->netmask, netmask4, sizeof (struct sockaddr_in)); 242 GNUNET_memcpy (net->netmask, netmask4, sizeof (struct sockaddr_in));
243 memcpy (net->network, &network4, sizeof (struct sockaddr_in)); 243 GNUNET_memcpy (net->network, &network4, sizeof (struct sockaddr_in));
244 } 244 }
245 245
246 if (addr->sa_family == AF_INET6) 246 if (addr->sa_family == AF_INET6)
@@ -268,8 +268,8 @@ interface_proc (void *cls,
268 for (c = 0; c < 4; c++) 268 for (c = 0; c < 4; c++)
269 net_elem[c] = addr_elem[c] & mask_elem[c]; 269 net_elem[c] = addr_elem[c] & mask_elem[c];
270 270
271 memcpy (net->netmask, netmask6, sizeof (struct sockaddr_in6)); 271 GNUNET_memcpy (net->netmask, netmask6, sizeof (struct sockaddr_in6));
272 memcpy (net->network, &network6, sizeof (struct sockaddr_in6)); 272 GNUNET_memcpy (net->network, &network6, sizeof (struct sockaddr_in6));
273 } 273 }
274 if (NULL == net) 274 if (NULL == net)
275 return GNUNET_OK; /* odd / unsupported address family */ 275 return GNUNET_OK; /* odd / unsupported address family */