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/namestore/gnunet-namestore-fcfsd.c | |
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/namestore/gnunet-namestore-fcfsd.c')
-rw-r--r-- | src/namestore/gnunet-namestore-fcfsd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index c2f506f6d..ed7009e02 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c | |||
@@ -321,7 +321,7 @@ iterate_cb (void *cls, | |||
321 | if (bytes_free < (strlen (name) + strlen (pkey) + 40)) | 321 | if (bytes_free < (strlen (name) + strlen (pkey) + 40)) |
322 | { | 322 | { |
323 | new_buf = GNUNET_malloc (zr->buf_len * 2); | 323 | new_buf = GNUNET_malloc (zr->buf_len * 2); |
324 | memcpy (new_buf, zr->zoneinfo, zr->write_offset); | 324 | GNUNET_memcpy (new_buf, zr->zoneinfo, zr->write_offset); |
325 | GNUNET_free (zr->zoneinfo); | 325 | GNUNET_free (zr->zoneinfo); |
326 | zr->zoneinfo = new_buf; | 326 | zr->zoneinfo = new_buf; |
327 | zr->buf_len *= 2; | 327 | zr->buf_len *= 2; |
@@ -456,7 +456,7 @@ post_iterator (void *cls, | |||
456 | { | 456 | { |
457 | if (size + off >= sizeof(request->domain_name)) | 457 | if (size + off >= sizeof(request->domain_name)) |
458 | size = sizeof (request->domain_name) - off - 1; | 458 | size = sizeof (request->domain_name) - off - 1; |
459 | memcpy (&request->domain_name[off], | 459 | GNUNET_memcpy (&request->domain_name[off], |
460 | data, | 460 | data, |
461 | size); | 461 | size); |
462 | request->domain_name[size+off] = '\0'; | 462 | request->domain_name[size+off] = '\0'; |
@@ -466,7 +466,7 @@ post_iterator (void *cls, | |||
466 | { | 466 | { |
467 | if (size + off >= sizeof(request->public_key)) | 467 | if (size + off >= sizeof(request->public_key)) |
468 | size = sizeof (request->public_key) - off - 1; | 468 | size = sizeof (request->public_key) - off - 1; |
469 | memcpy (&request->public_key[off], | 469 | GNUNET_memcpy (&request->public_key[off], |
470 | data, | 470 | data, |
471 | size); | 471 | size); |
472 | request->public_key[size+off] = '\0'; | 472 | request->public_key[size+off] = '\0'; |