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/set/gnunet-service-set.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/set/gnunet-service-set.c')
-rw-r--r-- | src/set/gnunet-service-set.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index 2aad60309..a5baf8cfd 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c | |||
@@ -842,7 +842,7 @@ execute_add (struct Set *set, | |||
842 | { | 842 | { |
843 | ee = GNUNET_malloc (el.size + sizeof *ee); | 843 | ee = GNUNET_malloc (el.size + sizeof *ee); |
844 | ee->element.size = el.size; | 844 | ee->element.size = el.size; |
845 | memcpy (&ee[1], | 845 | GNUNET_memcpy (&ee[1], |
846 | el.data, | 846 | el.data, |
847 | el.size); | 847 | el.size); |
848 | ee->element.data = &ee[1]; | 848 | ee->element.data = &ee[1]; |
@@ -1012,7 +1012,7 @@ again: | |||
1012 | ev = GNUNET_MQ_msg_extra (msg, | 1012 | ev = GNUNET_MQ_msg_extra (msg, |
1013 | ee->element.size, | 1013 | ee->element.size, |
1014 | GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT); | 1014 | GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT); |
1015 | memcpy (&msg[1], | 1015 | GNUNET_memcpy (&msg[1], |
1016 | ee->element.data, | 1016 | ee->element.data, |
1017 | ee->element.size); | 1017 | ee->element.size); |
1018 | msg->element_type = htons (ee->element.element_type); | 1018 | msg->element_type = htons (ee->element.element_type); |