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/hostlist/gnunet-daemon-hostlist_client.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/hostlist/gnunet-daemon-hostlist_client.c')
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c index c8c74a9ba..9f6413898 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.c +++ b/src/hostlist/gnunet-daemon-hostlist_client.c | |||
@@ -374,7 +374,7 @@ callback_download (void *ptr, | |||
374 | while ((left > 0) || (download_pos > 0)) | 374 | while ((left > 0) || (download_pos > 0)) |
375 | { | 375 | { |
376 | cpy = GNUNET_MIN (left, GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - download_pos); | 376 | cpy = GNUNET_MIN (left, GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - download_pos); |
377 | memcpy (&download_buffer[download_pos], cbuf, cpy); | 377 | GNUNET_memcpy (&download_buffer[download_pos], cbuf, cpy); |
378 | cbuf += cpy; | 378 | cbuf += cpy; |
379 | download_pos += cpy; | 379 | download_pos += cpy; |
380 | left -= cpy; | 380 | left -= cpy; |
@@ -1273,7 +1273,7 @@ handler_advertisement (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
1273 | 1273 | ||
1274 | hostlist = GNUNET_malloc (sizeof (struct Hostlist) + uri_size); | 1274 | hostlist = GNUNET_malloc (sizeof (struct Hostlist) + uri_size); |
1275 | hostlist->hostlist_uri = (const char *) &hostlist[1]; | 1275 | hostlist->hostlist_uri = (const char *) &hostlist[1]; |
1276 | memcpy (&hostlist[1], uri, uri_size); | 1276 | GNUNET_memcpy (&hostlist[1], uri, uri_size); |
1277 | hostlist->time_creation = GNUNET_TIME_absolute_get (); | 1277 | hostlist->time_creation = GNUNET_TIME_absolute_get (); |
1278 | hostlist->quality = HOSTLIST_INITIAL; | 1278 | hostlist->quality = HOSTLIST_INITIAL; |
1279 | hostlist_to_test = hostlist; | 1279 | hostlist_to_test = hostlist; |
@@ -1424,7 +1424,7 @@ load_hostlist_file () | |||
1424 | hostlist = GNUNET_malloc (sizeof (struct Hostlist) + strlen (uri) + 1); | 1424 | hostlist = GNUNET_malloc (sizeof (struct Hostlist) + strlen (uri) + 1); |
1425 | hostlist->hello_count = hellos_returned; | 1425 | hostlist->hello_count = hellos_returned; |
1426 | hostlist->hostlist_uri = (const char *) &hostlist[1]; | 1426 | hostlist->hostlist_uri = (const char *) &hostlist[1]; |
1427 | memcpy (&hostlist[1], uri, strlen (uri) + 1); | 1427 | GNUNET_memcpy (&hostlist[1], uri, strlen (uri) + 1); |
1428 | hostlist->quality = quality; | 1428 | hostlist->quality = quality; |
1429 | hostlist->time_creation.abs_value_us = created; | 1429 | hostlist->time_creation.abs_value_us = created; |
1430 | hostlist->time_last_usage.abs_value_us = last_used; | 1430 | hostlist->time_last_usage.abs_value_us = last_used; |