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/peerstore/peerstore_common.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/peerstore/peerstore_common.c')
-rw-r--r-- | src/peerstore/peerstore_common.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/peerstore/peerstore_common.c b/src/peerstore/peerstore_common.c index 5a008ca62..07d43db2e 100644 --- a/src/peerstore/peerstore_common.c +++ b/src/peerstore/peerstore_common.c | |||
@@ -47,11 +47,11 @@ PEERSTORE_hash_key (const char *sub_system, | |||
47 | totalsize = sssize + psize + ksize; | 47 | totalsize = sssize + psize + ksize; |
48 | block = GNUNET_malloc (totalsize); | 48 | block = GNUNET_malloc (totalsize); |
49 | blockptr = block; | 49 | blockptr = block; |
50 | memcpy (blockptr, sub_system, sssize); | 50 | GNUNET_memcpy (blockptr, sub_system, sssize); |
51 | blockptr += sssize; | 51 | blockptr += sssize; |
52 | memcpy (blockptr, peer, psize); | 52 | GNUNET_memcpy (blockptr, peer, psize); |
53 | blockptr += psize; | 53 | blockptr += psize; |
54 | memcpy (blockptr, key, ksize); | 54 | GNUNET_memcpy (blockptr, key, ksize); |
55 | GNUNET_CRYPTO_hash (block, totalsize, ret); | 55 | GNUNET_CRYPTO_hash (block, totalsize, ret); |
56 | GNUNET_free (block); | 56 | GNUNET_free (block); |
57 | } | 57 | } |
@@ -106,11 +106,11 @@ PEERSTORE_create_record_message (const char *sub_system, | |||
106 | srm->sub_system_size = htons (ss_size); | 106 | srm->sub_system_size = htons (ss_size); |
107 | srm->value_size = htons (value_size); | 107 | srm->value_size = htons (value_size); |
108 | dummy = &srm[1]; | 108 | dummy = &srm[1]; |
109 | memcpy (dummy, sub_system, ss_size); | 109 | GNUNET_memcpy (dummy, sub_system, ss_size); |
110 | dummy += ss_size; | 110 | dummy += ss_size; |
111 | memcpy (dummy, key, key_size); | 111 | GNUNET_memcpy (dummy, key, key_size); |
112 | dummy += key_size; | 112 | dummy += key_size; |
113 | memcpy (dummy, value, value_size); | 113 | GNUNET_memcpy (dummy, value, value_size); |
114 | return srm; | 114 | return srm; |
115 | } | 115 | } |
116 | 116 | ||
@@ -166,11 +166,11 @@ PEERSTORE_create_record_mq_envelope (const char *sub_system, | |||
166 | srm->value_size = htons (value_size); | 166 | srm->value_size = htons (value_size); |
167 | srm->options = htonl (options); | 167 | srm->options = htonl (options); |
168 | dummy = &srm[1]; | 168 | dummy = &srm[1]; |
169 | memcpy (dummy, sub_system, ss_size); | 169 | GNUNET_memcpy (dummy, sub_system, ss_size); |
170 | dummy += ss_size; | 170 | dummy += ss_size; |
171 | memcpy (dummy, key, key_size); | 171 | GNUNET_memcpy (dummy, key, key_size); |
172 | dummy += key_size; | 172 | dummy += key_size; |
173 | memcpy (dummy, value, value_size); | 173 | GNUNET_memcpy (dummy, value, value_size); |
174 | return ev; | 174 | return ev; |
175 | } | 175 | } |
176 | 176 | ||
@@ -222,7 +222,7 @@ PEERSTORE_parse_record_message (const struct GNUNET_MessageHeader *message) | |||
222 | { | 222 | { |
223 | record->peer = GNUNET_new (struct GNUNET_PeerIdentity); | 223 | record->peer = GNUNET_new (struct GNUNET_PeerIdentity); |
224 | 224 | ||
225 | memcpy (record->peer, &srm->peer, sizeof (struct GNUNET_PeerIdentity)); | 225 | GNUNET_memcpy (record->peer, &srm->peer, sizeof (struct GNUNET_PeerIdentity)); |
226 | } | 226 | } |
227 | record->expiry = GNUNET_new (struct GNUNET_TIME_Absolute); | 227 | record->expiry = GNUNET_new (struct GNUNET_TIME_Absolute); |
228 | 228 | ||
@@ -241,7 +241,7 @@ PEERSTORE_parse_record_message (const struct GNUNET_MessageHeader *message) | |||
241 | if (value_size > 0) | 241 | if (value_size > 0) |
242 | { | 242 | { |
243 | record->value = GNUNET_malloc (value_size); | 243 | record->value = GNUNET_malloc (value_size); |
244 | memcpy (record->value, dummy, value_size); | 244 | GNUNET_memcpy (record->value, dummy, value_size); |
245 | } | 245 | } |
246 | record->value_size = value_size; | 246 | record->value_size = value_size; |
247 | return record; | 247 | return record; |