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/cadet/gnunet-service-cadet_peer.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/cadet/gnunet-service-cadet_peer.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_peer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c index 22a8150c4..e19c3ca48 100644 --- a/src/cadet/gnunet-service-cadet_peer.c +++ b/src/cadet/gnunet-service-cadet_peer.c | |||
@@ -604,7 +604,7 @@ send_core_data_raw (void *cls, size_t size, void *buf) | |||
604 | GNUNET_break (0); | 604 | GNUNET_break (0); |
605 | return 0; | 605 | return 0; |
606 | } | 606 | } |
607 | memcpy (buf, msg, total_size); | 607 | GNUNET_memcpy (buf, msg, total_size); |
608 | GNUNET_free (cls); | 608 | GNUNET_free (cls); |
609 | return total_size; | 609 | return total_size; |
610 | } | 610 | } |
@@ -2518,7 +2518,7 @@ GCP_set_hello (struct CadetPeer *peer, | |||
2518 | { | 2518 | { |
2519 | size = GNUNET_HELLO_size (hello); | 2519 | size = GNUNET_HELLO_size (hello); |
2520 | peer->hello = GNUNET_malloc (size); | 2520 | peer->hello = GNUNET_malloc (size); |
2521 | memcpy (peer->hello, hello, size); | 2521 | GNUNET_memcpy (peer->hello, hello, size); |
2522 | } | 2522 | } |
2523 | else | 2523 | else |
2524 | { | 2524 | { |