aboutsummaryrefslogtreecommitdiff
path: root/src/consensus/gnunet-service-consensus.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/consensus/gnunet-service-consensus.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/consensus/gnunet-service-consensus.c')
-rw-r--r--src/consensus/gnunet-service-consensus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index ad01a276b..74035b46b 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -711,7 +711,7 @@ send_to_client_iter (void *cls,
711 ev = GNUNET_MQ_msg_extra (m, element->size, 711 ev = GNUNET_MQ_msg_extra (m, element->size,
712 GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT); 712 GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT);
713 m->element_type = htons (element->element_type); 713 m->element_type = htons (element->element_type);
714 memcpy (&m[1], element->data, element->size); 714 GNUNET_memcpy (&m[1], element->data, element->size);
715 GNUNET_MQ_send (session->client_mq, ev); 715 GNUNET_MQ_send (session->client_mq, ev);
716 } 716 }
717 else 717 else
@@ -2358,7 +2358,7 @@ initialize_session_peer_list (struct ConsensusSession *session,
2358 if (GNUNET_NO == local_peer_in_list) 2358 if (GNUNET_NO == local_peer_in_list)
2359 session->peers[session->num_peers - 1] = my_peer; 2359 session->peers[session->num_peers - 1] = my_peer;
2360 2360
2361 memcpy (session->peers, msg_peers, listed_peers * sizeof (struct GNUNET_PeerIdentity)); 2361 GNUNET_memcpy (session->peers, msg_peers, listed_peers * sizeof (struct GNUNET_PeerIdentity));
2362 qsort (session->peers, session->num_peers, sizeof (struct GNUNET_PeerIdentity), &peer_id_cmp); 2362 qsort (session->peers, session->num_peers, sizeof (struct GNUNET_PeerIdentity), &peer_id_cmp);
2363} 2363}
2364 2364
@@ -3091,7 +3091,7 @@ client_insert (void *cls,
3091 element = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + element_size); 3091 element = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + element_size);
3092 element->element_type = msg->element_type; 3092 element->element_type = msg->element_type;
3093 element->size = element_size; 3093 element->size = element_size;
3094 memcpy (&element[1], &msg[1], element_size); 3094 GNUNET_memcpy (&element[1], &msg[1], element_size);
3095 element->data = &element[1]; 3095 element->data = &element[1];
3096 { 3096 {
3097 struct SetKey key = { SET_KIND_CURRENT, 0, 0 }; 3097 struct SetKey key = { SET_KIND_CURRENT, 0, 0 };