aboutsummaryrefslogtreecommitdiff
path: root/src/fragmentation/fragmentation.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
committerChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
commitd8c53b12a818ff7cf82d06a1a69c395bdef85ee6 (patch)
tree0ebb0db416c157fcfde51a941185819dd12d51fd /src/fragmentation/fragmentation.c
parent5184c17d32a39c928c2a0fec3ee1ad098bbaa562 (diff)
downloadgnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.tar.gz
gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.zip
-avoid calling memcpy() with NULL argument, even if len is 0
Diffstat (limited to 'src/fragmentation/fragmentation.c')
-rw-r--r--src/fragmentation/fragmentation.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c
index 3a55502e7..1c6b86e9e 100644
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -232,7 +232,7 @@ transmit_next (void *cls)
232 fh->fragment_id = htonl (fc->fragment_id); 232 fh->fragment_id = htonl (fc->fragment_id);
233 fh->total_size = fc->msg->size; /* already in big-endian */ 233 fh->total_size = fc->msg->size; /* already in big-endian */
234 fh->offset = htons ((fc->mtu - sizeof (struct FragmentHeader)) * bit); 234 fh->offset = htons ((fc->mtu - sizeof (struct FragmentHeader)) * bit);
235 memcpy (&fh[1], &mbuf[bit * (fc->mtu - sizeof (struct FragmentHeader))], 235 GNUNET_memcpy (&fh[1], &mbuf[bit * (fc->mtu - sizeof (struct FragmentHeader))],
236 fsize - sizeof (struct FragmentHeader)); 236 fsize - sizeof (struct FragmentHeader));
237 if (NULL != fc->tracker) 237 if (NULL != fc->tracker)
238 GNUNET_BANDWIDTH_tracker_consume (fc->tracker, fsize); 238 GNUNET_BANDWIDTH_tracker_consume (fc->tracker, fsize);
@@ -339,7 +339,7 @@ GNUNET_FRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
339 fc->fragment_id = 339 fc->fragment_id =
340 GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 340 GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
341 UINT32_MAX); 341 UINT32_MAX);
342 memcpy (&fc[1], msg, size); 342 GNUNET_memcpy (&fc[1], msg, size);
343 bits = 343 bits =
344 (size + mtu - sizeof (struct FragmentHeader) - 1) / (mtu - 344 (size + mtu - sizeof (struct FragmentHeader) - 1) / (mtu -
345 sizeof (struct 345 sizeof (struct