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/consensus | |
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/consensus')
-rw-r--r-- | src/consensus/consensus_api.c | 4 | ||||
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c index 2eebcc439..088fafd08 100644 --- a/src/consensus/consensus_api.c +++ b/src/consensus/consensus_api.c | |||
@@ -240,7 +240,7 @@ GNUNET_CONSENSUS_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
240 | join_msg->start = GNUNET_TIME_absolute_hton (start); | 240 | join_msg->start = GNUNET_TIME_absolute_hton (start); |
241 | join_msg->deadline = GNUNET_TIME_absolute_hton (deadline); | 241 | join_msg->deadline = GNUNET_TIME_absolute_hton (deadline); |
242 | join_msg->num_peers = htonl (num_peers); | 242 | join_msg->num_peers = htonl (num_peers); |
243 | memcpy(&join_msg[1], | 243 | GNUNET_memcpy(&join_msg[1], |
244 | peers, | 244 | peers, |
245 | num_peers * sizeof (struct GNUNET_PeerIdentity)); | 245 | num_peers * sizeof (struct GNUNET_PeerIdentity)); |
246 | 246 | ||
@@ -282,7 +282,7 @@ GNUNET_CONSENSUS_insert (struct GNUNET_CONSENSUS_Handle *consensus, | |||
282 | ev = GNUNET_MQ_msg_extra (element_msg, element->size, | 282 | ev = GNUNET_MQ_msg_extra (element_msg, element->size, |
283 | GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT); | 283 | GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT); |
284 | 284 | ||
285 | memcpy (&element_msg[1], element->data, element->size); | 285 | GNUNET_memcpy (&element_msg[1], element->data, element->size); |
286 | 286 | ||
287 | if (NULL != idc) | 287 | if (NULL != idc) |
288 | { | 288 | { |
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 }; |