diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:20:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:20:23 +0000 |
commit | d8c53b12a818ff7cf82d06a1a69c395bdef85ee6 (patch) | |
tree | 0ebb0db416c157fcfde51a941185819dd12d51fd /src/ats | |
parent | 5184c17d32a39c928c2a0fec3ee1ad098bbaa562 (diff) | |
download | gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.tar.gz gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.zip |
-avoid calling memcpy() with NULL argument, even if len is 0
Diffstat (limited to 'src/ats')
-rw-r--r-- | src/ats/ats_api_scanner.c | 8 | ||||
-rw-r--r-- | src/ats/ats_api_scheduling.c | 4 | ||||
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.c | 4 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 4 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_performance.c | 2 | ||||
-rw-r--r-- | src/ats/plugin_ats_ril.c | 4 | ||||
-rw-r--r-- | src/ats/test_ats_lib.c | 2 |
7 files changed, 14 insertions, 14 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 */ |
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index 669e2db71..c4174f99e 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c | |||
@@ -496,11 +496,11 @@ send_add_address_message (struct GNUNET_ATS_SchedulingHandle *sh, | |||
496 | ar->session, | 496 | ar->session, |
497 | ar->slot); | 497 | ar->slot); |
498 | pm = (char *) &m[1]; | 498 | pm = (char *) &m[1]; |
499 | memcpy (pm, | 499 | GNUNET_memcpy (pm, |
500 | ar->address->address, | 500 | ar->address->address, |
501 | ar->address->address_length); | 501 | ar->address->address_length); |
502 | if (NULL != ar->address->transport_name) | 502 | if (NULL != ar->address->transport_name) |
503 | memcpy (&pm[ar->address->address_length], | 503 | GNUNET_memcpy (&pm[ar->address->address_length], |
504 | ar->address->transport_name, | 504 | ar->address->transport_name, |
505 | namelen); | 505 | namelen); |
506 | GNUNET_MQ_send (sh->mq, ev); | 506 | GNUNET_MQ_send (sh->mq, ev); |
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index 613df52ad..e2e68562c 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c | |||
@@ -2162,8 +2162,8 @@ create_ats_address (const struct GNUNET_PeerIdentity *peer, | |||
2162 | aa->addr_len = plugin_addr_len; | 2162 | aa->addr_len = plugin_addr_len; |
2163 | aa->addr = &aa[1]; | 2163 | aa->addr = &aa[1]; |
2164 | aa->plugin = (char *) &aa[1] + plugin_addr_len; | 2164 | aa->plugin = (char *) &aa[1] + plugin_addr_len; |
2165 | memcpy (&aa[1], plugin_addr, plugin_addr_len); | 2165 | GNUNET_memcpy (&aa[1], plugin_addr, plugin_addr_len); |
2166 | memcpy (aa->plugin, plugin_name, strlen (plugin_name) + 1); | 2166 | GNUNET_memcpy (aa->plugin, plugin_name, strlen (plugin_name) + 1); |
2167 | aa->session_id = session_id; | 2167 | aa->session_id = session_id; |
2168 | 2168 | ||
2169 | return aa; | 2169 | return aa; |
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index d8f467688..44a4782d5 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -118,7 +118,7 @@ create_address (const struct GNUNET_PeerIdentity *peer, | |||
118 | aa->peer = *peer; | 118 | aa->peer = *peer; |
119 | aa->addr_len = plugin_addr_len; | 119 | aa->addr_len = plugin_addr_len; |
120 | aa->addr = &aa[1]; | 120 | aa->addr = &aa[1]; |
121 | memcpy (&aa[1], | 121 | GNUNET_memcpy (&aa[1], |
122 | plugin_addr, | 122 | plugin_addr, |
123 | plugin_addr_len); | 123 | plugin_addr_len); |
124 | aa->plugin = GNUNET_strdup (plugin_name); | 124 | aa->plugin = GNUNET_strdup (plugin_name); |
@@ -597,7 +597,7 @@ transmit_req_addr (struct AddressIteration *ai, | |||
597 | msg->address_local_info = htonl ((uint32_t) local_address_info); | 597 | msg->address_local_info = htonl ((uint32_t) local_address_info); |
598 | addrp = (char *) &msg[1]; | 598 | addrp = (char *) &msg[1]; |
599 | if (NULL != plugin_addr) | 599 | if (NULL != plugin_addr) |
600 | memcpy (addrp, plugin_addr, plugin_addr_len); | 600 | GNUNET_memcpy (addrp, plugin_addr, plugin_addr_len); |
601 | if (NULL != plugin_name) | 601 | if (NULL != plugin_name) |
602 | strcpy (&addrp[plugin_addr_len], plugin_name); | 602 | strcpy (&addrp[plugin_addr_len], plugin_name); |
603 | uc = GNUNET_SERVER_client_get_user_context (ai->client, | 603 | uc = GNUNET_SERVER_client_get_user_context (ai->client, |
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c index 1b22039db..83a458018 100644 --- a/src/ats/gnunet-service-ats_performance.c +++ b/src/ats/gnunet-service-ats_performance.c | |||
@@ -107,7 +107,7 @@ notify_client (struct GNUNET_SERVER_Client *client, | |||
107 | sizeof (struct GNUNET_ATS_Properties)); | 107 | sizeof (struct GNUNET_ATS_Properties)); |
108 | msg->address_local_info = htonl (local_address_info); | 108 | msg->address_local_info = htonl (local_address_info); |
109 | addrp = (char *) &msg[1]; | 109 | addrp = (char *) &msg[1]; |
110 | memcpy (addrp, plugin_addr, plugin_addr_len); | 110 | GNUNET_memcpy (addrp, plugin_addr, plugin_addr_len); |
111 | strcpy (&addrp[plugin_addr_len], plugin_name); | 111 | strcpy (&addrp[plugin_addr_len], plugin_name); |
112 | if (NULL == client) | 112 | if (NULL == client) |
113 | { | 113 | { |
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c index 766a9936d..eac62c440 100644 --- a/src/ats/plugin_ats_ril.c +++ b/src/ats/plugin_ats_ril.c | |||
@@ -2089,8 +2089,8 @@ ril_cut_from_vector (void **old, | |||
2089 | else | 2089 | else |
2090 | { | 2090 | { |
2091 | tmpptr = GNUNET_malloc (size); | 2091 | tmpptr = GNUNET_malloc (size); |
2092 | memcpy (tmpptr, oldptr, bytes_before); | 2092 | GNUNET_memcpy (tmpptr, oldptr, bytes_before); |
2093 | memcpy (tmpptr + bytes_before, oldptr + (bytes_before + bytes_hole), bytes_after); | 2093 | GNUNET_memcpy (tmpptr + bytes_before, oldptr + (bytes_before + bytes_hole), bytes_after); |
2094 | } | 2094 | } |
2095 | if (NULL != *old) | 2095 | if (NULL != *old) |
2096 | { | 2096 | { |
diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c index b0c42ac3d..d02d257ad 100644 --- a/src/ats/test_ats_lib.c +++ b/src/ats/test_ats_lib.c | |||
@@ -364,7 +364,7 @@ make_peer (uint32_t pid, | |||
364 | memset (pk, | 364 | memset (pk, |
365 | (int) pid, | 365 | (int) pid, |
366 | sizeof (struct GNUNET_PeerIdentity)); | 366 | sizeof (struct GNUNET_PeerIdentity)); |
367 | memcpy (pk, | 367 | GNUNET_memcpy (pk, |
368 | &pid, | 368 | &pid, |
369 | sizeof (uint32_t)); | 369 | sizeof (uint32_t)); |
370 | } | 370 | } |