Mercurial > dovecot > core-2.2
changeset 21213:10a77a6881cd
global: Code cleanup - avoid passing NULL to functions with non-null parameter
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Sat, 19 Nov 2016 01:54:14 +0200 |
| parents | 09ea38867c8c |
| children | 06a5d5c99adb |
| files | src/lib-dcrypt/test-stream.c src/lib-index/mail-cache-lookup.c src/lib-storage/index/dbox-multi/mdbox-storage.c src/lib-storage/index/index-mailbox-size.c src/lib/buffer.c src/lib/istream.c |
| diffstat | 6 files changed, 21 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-dcrypt/test-stream.c Sat Nov 19 02:00:25 2016 +0200 +++ b/src/lib-dcrypt/test-stream.c Sat Nov 19 01:54:14 2016 +0200 @@ -213,7 +213,7 @@ test_assert_idx(pos + siz <= sizeof(payload), pos); if (pos + siz > sizeof(payload)) break; - test_assert_idx(memcmp(ptr, payload + pos, siz) == 0, pos); + test_assert_idx(siz == 0 || memcmp(ptr, payload + pos, siz) == 0, pos); i_stream_skip(is_2, siz); pos += siz; } @@ -264,7 +264,7 @@ test_assert_idx(pos + siz <= sizeof(payload), pos); if (pos + siz > sizeof(payload)) break; - test_assert_idx(memcmp(ptr, payload + pos, siz) == 0, pos); + test_assert_idx(siz == 0 || memcmp(ptr, payload + pos, siz) == 0, pos); i_stream_skip(is_2, siz); pos += siz; } @@ -357,7 +357,7 @@ test_assert_idx(pos + siz <= sizeof(payload), pos); if (pos + siz > sizeof(payload)) break; - test_assert_idx(memcmp(ptr, payload + pos, siz) == 0, pos); + test_assert_idx(siz == 0 || memcmp(ptr, payload + pos, siz) == 0, pos); i_stream_skip(is_2, siz); pos += siz; } @@ -405,7 +405,7 @@ test_assert_idx(pos + siz <= sizeof(payload), pos); if (pos + siz > sizeof(payload)) break; - test_assert_idx(memcmp(ptr, payload + pos, siz) == 0, pos); + test_assert_idx(siz == 0 || memcmp(ptr, payload + pos, siz) == 0, pos); i_stream_skip(is_2, siz); pos += siz; }
--- a/src/lib-index/mail-cache-lookup.c Sat Nov 19 02:00:25 2016 +0200 +++ b/src/lib-index/mail-cache-lookup.c Sat Nov 19 01:54:14 2016 +0200 @@ -477,9 +477,11 @@ hdr_data = p_new(ctx->pool, struct header_lookup_data, 1); hdr_data->data_size = data_size; - hdr_data->data = data_dup = data_size == 0 ? NULL : - p_malloc(ctx->pool, data_size); - memcpy(data_dup, CONST_PTR_OFFSET(field->data, pos), data_size); + if (data_size > 0) { + hdr_data->data = data_dup = + p_malloc(ctx->pool, data_size); + memcpy(data_dup, CONST_PTR_OFFSET(field->data, pos), data_size); + } for (i = 0; i < lines_count; i++) { hdr_line.line_num = lines[i];
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c Sat Nov 19 02:00:25 2016 +0200 +++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c Sat Nov 19 01:54:14 2016 +0200 @@ -214,7 +214,8 @@ return -1; } memset(hdr, 0, sizeof(*hdr)); - memcpy(hdr, data, I_MIN(data_size, sizeof(*hdr))); + if (data_size > 0) + memcpy(hdr, data, I_MIN(data_size, sizeof(*hdr))); *need_resize_r = data_size < sizeof(*hdr); return 0; }
--- a/src/lib-storage/index/index-mailbox-size.c Sat Nov 19 02:00:25 2016 +0200 +++ b/src/lib-storage/index/index-mailbox-size.c Sat Nov 19 01:54:14 2016 +0200 @@ -57,8 +57,10 @@ mail_index_get_header_ext(update->view, update->box->vsize_hdr_ext_id, &data, &size); - memcpy(&update->orig_vsize_hdr, data, - I_MIN(size, sizeof(update->orig_vsize_hdr))); + if (size > 0) { + memcpy(&update->orig_vsize_hdr, data, + I_MIN(size, sizeof(update->orig_vsize_hdr))); + } if (size == sizeof(update->vsize_hdr)) memcpy(&update->vsize_hdr, data, sizeof(update->vsize_hdr)); else {
--- a/src/lib/buffer.c Sat Nov 19 02:00:25 2016 +0200 +++ b/src/lib/buffer.c Sat Nov 19 01:54:14 2016 +0200 @@ -185,7 +185,8 @@ struct real_buffer *buf = (struct real_buffer *)_buf; buffer_check_limits(buf, pos, data_size); - memcpy(buf->w_buffer + pos, data, data_size); + if (data_size > 0) + memcpy(buf->w_buffer + pos, data, data_size); } void buffer_append(buffer_t *buf, const void *data, size_t data_size)
--- a/src/lib/istream.c Sat Nov 19 02:00:25 2016 +0200 +++ b/src/lib/istream.c Sat Nov 19 01:54:14 2016 +0200 @@ -593,8 +593,10 @@ void i_stream_compress(struct istream_private *stream) { - memmove(stream->w_buffer, stream->w_buffer + stream->skip, - stream->pos - stream->skip); + if (stream->skip != stream->pos) { + memmove(stream->w_buffer, stream->w_buffer + stream->skip, + stream->pos - stream->skip); + } stream->pos -= stream->skip; stream->skip = 0;