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/psyc/test_psyc.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/psyc/test_psyc.c')
-rw-r--r-- | src/psyc/test_psyc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index 402b17b96..9797a96b5 100644 --- a/src/psyc/test_psyc.c +++ b/src/psyc/test_psyc.c | |||
@@ -607,7 +607,7 @@ tmit_notify_data (void *cls, uint16_t *data_size, void *data) | |||
607 | tmit->paused = GNUNET_NO; | 607 | tmit->paused = GNUNET_NO; |
608 | 608 | ||
609 | *data_size = size; | 609 | *data_size = size; |
610 | memcpy (data, tmit->data[tmit->n], size); | 610 | GNUNET_memcpy (data, tmit->data[tmit->n], size); |
611 | 611 | ||
612 | return ++tmit->n < tmit->data_count ? GNUNET_NO : GNUNET_YES; | 612 | return ++tmit->n < tmit->data_count ? GNUNET_NO : GNUNET_YES; |
613 | } | 613 | } |
@@ -653,9 +653,9 @@ tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper, | |||
653 | tmit->mod_value = tmit->mod->value + value_size; | 653 | tmit->mod_value = tmit->mod->value + value_size; |
654 | } | 654 | } |
655 | 655 | ||
656 | memcpy (data, tmit->mod->name, name_size); | 656 | GNUNET_memcpy (data, tmit->mod->name, name_size); |
657 | ((char *)data)[name_size] = '\0'; | 657 | ((char *)data)[name_size] = '\0'; |
658 | memcpy ((char *)data + name_size + 1, tmit->mod->value, value_size); | 658 | GNUNET_memcpy ((char *)data + name_size + 1, tmit->mod->value, value_size); |
659 | } | 659 | } |
660 | else if (NULL != tmit->mod_value && 0 < tmit->mod_value_size) | 660 | else if (NULL != tmit->mod_value && 0 < tmit->mod_value_size) |
661 | { /* Modifier continuation */ | 661 | { /* Modifier continuation */ |
@@ -682,7 +682,7 @@ tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper, | |||
682 | } | 682 | } |
683 | 683 | ||
684 | *data_size = value_size; | 684 | *data_size = value_size; |
685 | memcpy (data, value, value_size); | 685 | GNUNET_memcpy (data, value, value_size); |
686 | } | 686 | } |
687 | 687 | ||
688 | return GNUNET_NO; | 688 | return GNUNET_NO; |