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/identity/gnunet-service-identity.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/identity/gnunet-service-identity.c')
-rw-r--r-- | src/identity/gnunet-service-identity.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c index 9185aac64..b868719c3 100644 --- a/src/identity/gnunet-service-identity.c +++ b/src/identity/gnunet-service-identity.c | |||
@@ -190,7 +190,7 @@ send_result_code (struct GNUNET_SERVER_Client *client, | |||
190 | rcm->header.size = htons (sizeof (struct GNUNET_IDENTITY_ResultCodeMessage) + elen); | 190 | rcm->header.size = htons (sizeof (struct GNUNET_IDENTITY_ResultCodeMessage) + elen); |
191 | rcm->result_code = htonl (result_code); | 191 | rcm->result_code = htonl (result_code); |
192 | if (0 < elen) | 192 | if (0 < elen) |
193 | memcpy (&rcm[1], emsg, elen); | 193 | GNUNET_memcpy (&rcm[1], emsg, elen); |
194 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 194 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
195 | "Sending result %d (%s) to client\n", | 195 | "Sending result %d (%s) to client\n", |
196 | (int) result_code, | 196 | (int) result_code, |
@@ -219,7 +219,7 @@ create_update_message (struct Ego *ego) | |||
219 | um->name_len = htons (name_len); | 219 | um->name_len = htons (name_len); |
220 | um->end_of_list = htons (GNUNET_NO); | 220 | um->end_of_list = htons (GNUNET_NO); |
221 | um->private_key = *ego->pk; | 221 | um->private_key = *ego->pk; |
222 | memcpy (&um[1], ego->identifier, name_len); | 222 | GNUNET_memcpy (&um[1], ego->identifier, name_len); |
223 | return um; | 223 | return um; |
224 | } | 224 | } |
225 | 225 | ||
@@ -245,7 +245,7 @@ create_set_default_message (struct Ego *ego, | |||
245 | sdm->name_len = htons (name_len); | 245 | sdm->name_len = htons (name_len); |
246 | sdm->reserved = htons (0); | 246 | sdm->reserved = htons (0); |
247 | sdm->private_key = *ego->pk; | 247 | sdm->private_key = *ego->pk; |
248 | memcpy (&sdm[1], servicename, name_len); | 248 | GNUNET_memcpy (&sdm[1], servicename, name_len); |
249 | return sdm; | 249 | return sdm; |
250 | } | 250 | } |
251 | 251 | ||