aboutsummaryrefslogtreecommitdiff
path: root/src/core/gnunet-service-core_neighbours.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/core/gnunet-service-core_neighbours.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/core/gnunet-service-core_neighbours.c')
-rw-r--r--src/core/gnunet-service-core_neighbours.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/gnunet-service-core_neighbours.c b/src/core/gnunet-service-core_neighbours.c
index c1c62cf1a..c2f3ef805 100644
--- a/src/core/gnunet-service-core_neighbours.c
+++ b/src/core/gnunet-service-core_neighbours.c
@@ -261,7 +261,7 @@ transmit_ready (void *cls,
261 overdue = GNUNET_TIME_absolute_get_duration (m->deadline); 261 overdue = GNUNET_TIME_absolute_get_duration (m->deadline);
262 cbuf = buf; 262 cbuf = buf;
263 GNUNET_assert (size >= m->size); 263 GNUNET_assert (size >= m->size);
264 memcpy (cbuf, 264 GNUNET_memcpy (cbuf,
265 &m[1], 265 &m[1],
266 m->size); 266 m->size);
267 ret = m->size; 267 ret = m->size;
@@ -521,7 +521,7 @@ GSC_NEIGHBOURS_transmit (const struct GNUNET_PeerIdentity *target,
521 me = GNUNET_malloc (sizeof (struct NeighbourMessageEntry) + msize); 521 me = GNUNET_malloc (sizeof (struct NeighbourMessageEntry) + msize);
522 me->deadline = GNUNET_TIME_relative_to_absolute (timeout); 522 me->deadline = GNUNET_TIME_relative_to_absolute (timeout);
523 me->size = msize; 523 me->size = msize;
524 memcpy (&me[1], 524 GNUNET_memcpy (&me[1],
525 msg, 525 msg,
526 msize); 526 msize);
527 GNUNET_CONTAINER_DLL_insert_tail (n->message_head, 527 GNUNET_CONTAINER_DLL_insert_tail (n->message_head,