-avoid calling memcpy() with NULL argument, even if len is 0

3 files changed, 5 insertions, 5 deletions

diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c
index 017e2b161..2cd0c161c 100644
--- a/src/namecache/gnunet-service-namecache.c
+++ b/src/namecache/gnunet-service-namecache.c
@@ -224,7 +224,7 @@ handle_lookup_block_it (void *cls,
   r->expire = block->expiration_time;
   r->signature = block->signature;
   r->derived_key = block->derived_key;
-  memcpy (&r[1], &block[1], esize);
+  GNUNET_memcpy (&r[1], &block[1], esize);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending `%s' message with expiration time %s\n",
               "NAMECACHE_LOOKUP_BLOCK_RESPONSE",
@@ -333,7 +333,7 @@ handle_block_cache (void *cls,
               "Received `%s' message with expiration time %s\n",
               "NAMECACHE_BLOCK_CACHE",
               GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (block->expiration_time)));
-  memcpy (&block[1], &rp_msg[1], esize);
+  GNUNET_memcpy (&block[1], &rp_msg[1], esize);
   res = GSN_database->cache_block (GSN_database->cls,
                                    block);
   GNUNET_free (block);
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 51cbacf12..46d685a26 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -240,7 +240,7 @@ handle_lookup_block_response (void *cls,
                                  sizeof (struct GNUNET_TIME_AbsoluteNBO) +
                                  sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose));
     block->expiration_time = msg->expire;
-    memcpy (&block[1],
+    GNUNET_memcpy (&block[1],
             &msg[1],
             size);
     if (GNUNET_OK !=
@@ -505,7 +505,7 @@ GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
   msg->expire = block->expiration_time;
   msg->signature = block->signature;
   msg->derived_key = block->derived_key;
-  memcpy (&msg[1],
+  GNUNET_memcpy (&msg[1],
           &block[1],
           blen);
   GNUNET_MQ_send (h->mq,
diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c
index 5a1bb4e12..b091364a5 100644
--- a/src/namecache/plugin_namecache_flat.c
+++ b/src/namecache/plugin_namecache_flat.c
@@ -328,7 +328,7 @@ namecache_cache_block (void *cls,
   }
   entry = GNUNET_malloc (sizeof (struct FlatFileEntry));
   entry->block = GNUNET_malloc (block_size);
-  memcpy (entry->block, block, block_size);
+  GNUNET_memcpy (entry->block, block, block_size);
   GNUNET_CONTAINER_multihashmap_remove_all (plugin->hm, &query);
   if (GNUNET_OK != 
       GNUNET_CONTAINER_multihashmap_put (plugin->hm,