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/testbed-logger | |
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/testbed-logger')
-rw-r--r-- | src/testbed-logger/testbed_logger_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testbed-logger/testbed_logger_api.c b/src/testbed-logger/testbed_logger_api.c index 9d8aa9ad3..19a5d9b50 100644 --- a/src/testbed-logger/testbed_logger_api.c +++ b/src/testbed-logger/testbed_logger_api.c | |||
@@ -179,7 +179,7 @@ dispatch_buffer (struct GNUNET_TESTBED_LOGGER_Handle *h) | |||
179 | env = GNUNET_MQ_msg_extra (msg, | 179 | env = GNUNET_MQ_msg_extra (msg, |
180 | h->buse, | 180 | h->buse, |
181 | GNUNET_MESSAGE_TYPE_TESTBED_LOGGER_MSG); | 181 | GNUNET_MESSAGE_TYPE_TESTBED_LOGGER_MSG); |
182 | memcpy (&msg[1], | 182 | GNUNET_memcpy (&msg[1], |
183 | h->buf, | 183 | h->buf, |
184 | h->buse); | 184 | h->buse); |
185 | h->bwrote += h->buse; | 185 | h->bwrote += h->buse; |
@@ -284,7 +284,7 @@ GNUNET_TESTBED_LOGGER_write (struct GNUNET_TESTBED_LOGGER_Handle *h, | |||
284 | { | 284 | { |
285 | size_t fit_size = GNUNET_MIN (size, | 285 | size_t fit_size = GNUNET_MIN (size, |
286 | BUFFER_SIZE - h->buse); | 286 | BUFFER_SIZE - h->buse); |
287 | memcpy (&h->buf[h->buse], | 287 | GNUNET_memcpy (&h->buf[h->buse], |
288 | data, | 288 | data, |
289 | fit_size); | 289 | fit_size); |
290 | h->buse += fit_size; | 290 | h->buse += fit_size; |