From d8c53b12a818ff7cf82d06a1a69c395bdef85ee6 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 8 Jul 2016 17:20:23 +0000 Subject: -avoid calling memcpy() with NULL argument, even if len is 0 --- src/hostlist/gnunet-daemon-hostlist_client.c | 6 +++--- src/hostlist/gnunet-daemon-hostlist_server.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/hostlist') 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, while ((left > 0) || (download_pos > 0)) { cpy = GNUNET_MIN (left, GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - download_pos); - memcpy (&download_buffer[download_pos], cbuf, cpy); + GNUNET_memcpy (&download_buffer[download_pos], cbuf, cpy); cbuf += cpy; download_pos += cpy; left -= cpy; @@ -1273,7 +1273,7 @@ handler_advertisement (void *cls, const struct GNUNET_PeerIdentity *peer, hostlist = GNUNET_malloc (sizeof (struct Hostlist) + uri_size); hostlist->hostlist_uri = (const char *) &hostlist[1]; - memcpy (&hostlist[1], uri, uri_size); + GNUNET_memcpy (&hostlist[1], uri, uri_size); hostlist->time_creation = GNUNET_TIME_absolute_get (); hostlist->quality = HOSTLIST_INITIAL; hostlist_to_test = hostlist; @@ -1424,7 +1424,7 @@ load_hostlist_file () hostlist = GNUNET_malloc (sizeof (struct Hostlist) + strlen (uri) + 1); hostlist->hello_count = hellos_returned; hostlist->hostlist_uri = (const char *) &hostlist[1]; - memcpy (&hostlist[1], uri, strlen (uri) + 1); + GNUNET_memcpy (&hostlist[1], uri, strlen (uri) + 1); hostlist->quality = quality; hostlist->time_creation.abs_value_us = created; hostlist->time_last_usage.abs_value_us = last_used; 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, GNUNET_array_grow (builder->data, builder->size, old + s); - memcpy (&builder->data[old], + GNUNET_memcpy (&builder->data[old], hello, s); } @@ -467,11 +467,11 @@ adv_transmit_ready (void *cls, header.type = htons (GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT); header.size = htons (transmission_size); GNUNET_assert (size >= transmission_size); - memcpy (buf, + GNUNET_memcpy (buf, &header, sizeof (struct GNUNET_MessageHeader)); cbuf = buf; - memcpy (&cbuf[sizeof (struct GNUNET_MessageHeader)], + GNUNET_memcpy (&cbuf[sizeof (struct GNUNET_MessageHeader)], hostlist_uri, uri_size); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, -- cgit v1.2.3