aboutsummaryrefslogtreecommitdiff
path: root/src/namecache/gnunet-service-namecache.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
committerChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
commitd8c53b12a818ff7cf82d06a1a69c395bdef85ee6 (patch)
tree0ebb0db416c157fcfde51a941185819dd12d51fd /src/namecache/gnunet-service-namecache.c
parent5184c17d32a39c928c2a0fec3ee1ad098bbaa562 (diff)
downloadgnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.tar.gz
gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.zip
-avoid calling memcpy() with NULL argument, even if len is 0
Diffstat (limited to 'src/namecache/gnunet-service-namecache.c')
-rw-r--r--src/namecache/gnunet-service-namecache.c4
1 files changed, 2 insertions, 2 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,
224 r->expire = block->expiration_time; 224 r->expire = block->expiration_time;
225 r->signature = block->signature; 225 r->signature = block->signature;
226 r->derived_key = block->derived_key; 226 r->derived_key = block->derived_key;
227 memcpy (&r[1], &block[1], esize); 227 GNUNET_memcpy (&r[1], &block[1], esize);
228 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 228 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
229 "Sending `%s' message with expiration time %s\n", 229 "Sending `%s' message with expiration time %s\n",
230 "NAMECACHE_LOOKUP_BLOCK_RESPONSE", 230 "NAMECACHE_LOOKUP_BLOCK_RESPONSE",
@@ -333,7 +333,7 @@ handle_block_cache (void *cls,
333 "Received `%s' message with expiration time %s\n", 333 "Received `%s' message with expiration time %s\n",
334 "NAMECACHE_BLOCK_CACHE", 334 "NAMECACHE_BLOCK_CACHE",
335 GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (block->expiration_time))); 335 GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (block->expiration_time)));
336 memcpy (&block[1], &rp_msg[1], esize); 336 GNUNET_memcpy (&block[1], &rp_msg[1], esize);
337 res = GSN_database->cache_block (GSN_database->cls, 337 res = GSN_database->cache_block (GSN_database->cls,
338 block); 338 block);
339 GNUNET_free (block); 339 GNUNET_free (block);