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/json | |
| 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/json')
| -rw-r--r-- | src/json/json_mhd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/json/json_mhd.c b/src/json/json_mhd.c index e94c05009..e32e092ff 100644 --- a/src/json/json_mhd.c +++ b/src/json/json_mhd.c | |||
| @@ -76,7 +76,7 @@ buffer_init (struct Buffer *buf, | |||
| 76 | if (data_size > alloc_size) | 76 | if (data_size > alloc_size) |
| 77 | alloc_size = data_size; | 77 | alloc_size = data_size; |
| 78 | buf->data = GNUNET_malloc (alloc_size); | 78 | buf->data = GNUNET_malloc (alloc_size); |
| 79 | memcpy (buf->data, data, data_size); | 79 | GNUNET_memcpy (buf->data, data, data_size); |
| 80 | return GNUNET_OK; | 80 | return GNUNET_OK; |
| 81 | } | 81 | } |
| 82 | 82 | ||
| @@ -122,12 +122,12 @@ buffer_append (struct Buffer *buf, | |||
| 122 | if (new_size > max_size) | 122 | if (new_size > max_size) |
| 123 | return GNUNET_NO; | 123 | return GNUNET_NO; |
| 124 | new_buf = GNUNET_malloc (new_size); | 124 | new_buf = GNUNET_malloc (new_size); |
| 125 | memcpy (new_buf, buf->data, buf->fill); | 125 | GNUNET_memcpy (new_buf, buf->data, buf->fill); |
| 126 | GNUNET_free (buf->data); | 126 | GNUNET_free (buf->data); |
| 127 | buf->data = new_buf; | 127 | buf->data = new_buf; |
| 128 | buf->alloc = new_size; | 128 | buf->alloc = new_size; |
| 129 | } | 129 | } |
| 130 | memcpy (buf->data + buf->fill, data, data_size); | 130 | GNUNET_memcpy (buf->data + buf->fill, data, data_size); |
| 131 | buf->fill += data_size; | 131 | buf->fill += data_size; |
| 132 | return GNUNET_OK; | 132 | return GNUNET_OK; |
| 133 | } | 133 | } |