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/namecache | |
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/namecache')
-rw-r--r-- | src/namecache/gnunet-service-namecache.c | 4 | ||||
-rw-r--r-- | src/namecache/namecache_api.c | 4 | ||||
-rw-r--r-- | src/namecache/plugin_namecache_flat.c | 2 |
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, | |||
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); |
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, | |||
240 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + | 240 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + |
241 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose)); | 241 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose)); |
242 | block->expiration_time = msg->expire; | 242 | block->expiration_time = msg->expire; |
243 | memcpy (&block[1], | 243 | GNUNET_memcpy (&block[1], |
244 | &msg[1], | 244 | &msg[1], |
245 | size); | 245 | size); |
246 | if (GNUNET_OK != | 246 | if (GNUNET_OK != |
@@ -505,7 +505,7 @@ GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h, | |||
505 | msg->expire = block->expiration_time; | 505 | msg->expire = block->expiration_time; |
506 | msg->signature = block->signature; | 506 | msg->signature = block->signature; |
507 | msg->derived_key = block->derived_key; | 507 | msg->derived_key = block->derived_key; |
508 | memcpy (&msg[1], | 508 | GNUNET_memcpy (&msg[1], |
509 | &block[1], | 509 | &block[1], |
510 | blen); | 510 | blen); |
511 | GNUNET_MQ_send (h->mq, | 511 | 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, | |||
328 | } | 328 | } |
329 | entry = GNUNET_malloc (sizeof (struct FlatFileEntry)); | 329 | entry = GNUNET_malloc (sizeof (struct FlatFileEntry)); |
330 | entry->block = GNUNET_malloc (block_size); | 330 | entry->block = GNUNET_malloc (block_size); |
331 | memcpy (entry->block, block, block_size); | 331 | GNUNET_memcpy (entry->block, block, block_size); |
332 | GNUNET_CONTAINER_multihashmap_remove_all (plugin->hm, &query); | 332 | GNUNET_CONTAINER_multihashmap_remove_all (plugin->hm, &query); |
333 | if (GNUNET_OK != | 333 | if (GNUNET_OK != |
334 | GNUNET_CONTAINER_multihashmap_put (plugin->hm, | 334 | GNUNET_CONTAINER_multihashmap_put (plugin->hm, |