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_server.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_server.c')
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c index 23356799d..40820e557 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.c +++ b/src/hostlist/gnunet-daemon-hostlist_server.c | |||
@@ -292,7 +292,7 @@ host_processor (void *cls, | |||
292 | GNUNET_array_grow (builder->data, | 292 | GNUNET_array_grow (builder->data, |
293 | builder->size, | 293 | builder->size, |
294 | old + s); | 294 | old + s); |
295 | memcpy (&builder->data[old], | 295 | GNUNET_memcpy (&builder->data[old], |
296 | hello, | 296 | hello, |
297 | s); | 297 | s); |
298 | } | 298 | } |
@@ -467,11 +467,11 @@ adv_transmit_ready (void *cls, | |||
467 | header.type = htons (GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT); | 467 | header.type = htons (GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT); |
468 | header.size = htons (transmission_size); | 468 | header.size = htons (transmission_size); |
469 | GNUNET_assert (size >= transmission_size); | 469 | GNUNET_assert (size >= transmission_size); |
470 | memcpy (buf, | 470 | GNUNET_memcpy (buf, |
471 | &header, | 471 | &header, |
472 | sizeof (struct GNUNET_MessageHeader)); | 472 | sizeof (struct GNUNET_MessageHeader)); |
473 | cbuf = buf; | 473 | cbuf = buf; |
474 | memcpy (&cbuf[sizeof (struct GNUNET_MessageHeader)], | 474 | GNUNET_memcpy (&cbuf[sizeof (struct GNUNET_MessageHeader)], |
475 | hostlist_uri, | 475 | hostlist_uri, |
476 | uri_size); | 476 | uri_size); |
477 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 477 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |