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/datastore/perf_plugin_datastore.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/datastore/perf_plugin_datastore.c')
-rw-r--r-- | src/datastore/perf_plugin_datastore.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c index cbc01844e..1e43b74b4 100644 --- a/src/datastore/perf_plugin_datastore.c +++ b/src/datastore/perf_plugin_datastore.c | |||
@@ -179,7 +179,7 @@ do_put (struct CpsRunContext *crc) | |||
179 | if (i > 255) | 179 | if (i > 255) |
180 | memset (value, i - 255, size / 2); | 180 | memset (value, i - 255, size / 2); |
181 | value[0] = crc->i; | 181 | value[0] = crc->i; |
182 | memcpy (&value[4], &i, sizeof (i)); | 182 | GNUNET_memcpy (&value[4], &i, sizeof (i)); |
183 | prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100); | 183 | prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100); |
184 | crc->api->put (crc->api->cls, &key, size, value, 1 + i % 4 /* type */ , | 184 | crc->api->put (crc->api->cls, &key, size, value, 1 + i % 4 /* type */ , |
185 | prio, i % 4 /* anonymity */ , | 185 | prio, i % 4 /* anonymity */ , |
@@ -212,7 +212,7 @@ iterate_zeros (void *cls, | |||
212 | 212 | ||
213 | GNUNET_assert (key != NULL); | 213 | GNUNET_assert (key != NULL); |
214 | GNUNET_assert (size >= 8); | 214 | GNUNET_assert (size >= 8); |
215 | memcpy (&i, &cdata[4], sizeof (i)); | 215 | GNUNET_memcpy (&i, &cdata[4], sizeof (i)); |
216 | hits[i / 8] |= (1 << (i % 8)); | 216 | hits[i / 8] |= (1 << (i % 8)); |
217 | 217 | ||
218 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 218 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -267,7 +267,7 @@ expiration_get (void *cls, | |||
267 | const char *cdata = data; | 267 | const char *cdata = data; |
268 | 268 | ||
269 | GNUNET_assert (size >= 8); | 269 | GNUNET_assert (size >= 8); |
270 | memcpy (&i, &cdata[4], sizeof (i)); | 270 | GNUNET_memcpy (&i, &cdata[4], sizeof (i)); |
271 | hits[i / 8] |= (1 << (i % 8)); | 271 | hits[i / 8] |= (1 << (i % 8)); |
272 | crc->cnt++; | 272 | crc->cnt++; |
273 | if (PUT_10 <= crc->cnt) | 273 | if (PUT_10 <= crc->cnt) |
@@ -320,7 +320,7 @@ replication_get (void *cls, | |||
320 | 320 | ||
321 | GNUNET_assert (NULL != key); | 321 | GNUNET_assert (NULL != key); |
322 | GNUNET_assert (size >= 8); | 322 | GNUNET_assert (size >= 8); |
323 | memcpy (&i, &cdata[4], sizeof (i)); | 323 | GNUNET_memcpy (&i, &cdata[4], sizeof (i)); |
324 | hits[i / 8] |= (1 << (i % 8)); | 324 | hits[i / 8] |= (1 << (i % 8)); |
325 | crc->cnt++; | 325 | crc->cnt++; |
326 | if (PUT_10 <= crc->cnt) | 326 | if (PUT_10 <= crc->cnt) |