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/datastore/gnunet-service-datastore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/datastore/gnunet-service-datastore.c') diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c index 620705ee2..5853d447d 100644 --- a/src/datastore/gnunet-service-datastore.c +++ b/src/datastore/gnunet-service-datastore.c @@ -526,7 +526,7 @@ transmit_callback (void *cls, size_t size, void *buf) return 0; } GNUNET_assert (size >= msize); - memcpy (buf, tcc->msg, msize); + GNUNET_memcpy (buf, tcc->msg, msize); GNUNET_SERVER_receive_done (tcc->client, GNUNET_OK); GNUNET_SERVER_client_drop (tcc->client); GNUNET_free (tcc->msg); @@ -598,7 +598,7 @@ transmit_status (struct GNUNET_SERVER_Client *client, int code, const char *msg) sm->status = htonl (code); sm->min_expiration = GNUNET_TIME_absolute_hton (min_expiration); if (slen > 0) - memcpy (&sm[1], msg, slen); + GNUNET_memcpy (&sm[1], msg, slen); transmit (client, &sm->header); } @@ -662,7 +662,7 @@ transmit_item (void *cls, dm->expiration = GNUNET_TIME_absolute_hton (expiration); dm->uid = GNUNET_htonll (uid); dm->key = *key; - memcpy (&dm[1], data, size); + GNUNET_memcpy (&dm[1], data, size); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' message for `%s' of type %u with expiration %s (in: %s)\n", "DATA", GNUNET_h2s (key), type, @@ -1067,7 +1067,7 @@ handle_put (void *cls, sizeof (struct DataMessage)); pc->client = client; GNUNET_SERVER_client_keep (client); - memcpy (&pc[1], dm, size + sizeof (struct DataMessage)); + GNUNET_memcpy (&pc[1], dm, size + sizeof (struct DataMessage)); if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (filter, &dm->key)) { GNUNET_CRYPTO_hash (&dm[1], size, &vhash); -- cgit v1.2.3