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/gnunet-service-ats_addresses.c | |
| 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/gnunet-service-ats_addresses.c')
| -rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, |