From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Mon, 25 Jul 2016 07:24:44 +0000 (+0300)
Subject: lib,lib-test: stop calling memcmp and memcpy with NULL in tests
X-Git-Tag: 2.2.26~362
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e06a0ebd58f28372cbdd62a3e4a49a1d1182be5;p=thirdparty%2Fdovecot%2Fcore.git

lib,lib-test: stop calling memcmp and memcpy with NULL in tests
---

diff --git a/src/lib-test/test-common.c b/src/lib-test/test-common.c
index 270e0effff..ffa627d3c0 100644
--- a/src/lib-test/test-common.c
+++ b/src/lib-test/test-common.c
@@ -72,8 +72,10 @@ static ssize_t test_read(struct istream_private *stream)
 			stream->buffer = stream->w_buffer;
 			stream->buffer_size = cur_max;
 		}
-		memcpy(stream->w_buffer + new_skip_diff, tstream->orig_buffer,
-		       cur_max - new_skip_diff);
+		ssize_t size = cur_max - new_skip_diff;
+		if (size > 0)
+			memcpy(stream->w_buffer + new_skip_diff,
+				tstream->orig_buffer, (size_t)size);
 
 		ret = cur_max - stream->pos;
 		stream->pos = cur_max;
diff --git a/src/lib/test-istream-base64-decoder.c b/src/lib/test-istream-base64-decoder.c
index 1848937847..ffdab55a26 100644
--- a/src/lib/test-istream-base64-decoder.c
+++ b/src/lib/test-istream-base64-decoder.c
@@ -43,7 +43,9 @@ decode_test(const char *base64_input, const char *output, bool broken_input)
 		    (input->stream_errno == EINVAL && broken_input));
 
 	data = i_stream_get_data(input, &size);
-	test_assert(size == strlen(output) && memcmp(data, output, size) == 0);
+	test_assert(size == strlen(output));
+	if (size > 0)
+		test_assert(memcmp(data, output, size) == 0);
 	i_stream_unref(&input);
 	i_stream_unref(&input_data);
 }
diff --git a/src/lib/test-istream-crlf.c b/src/lib/test-istream-crlf.c
index b6ed18bd3a..1750da2bd8 100644
--- a/src/lib/test-istream-crlf.c
+++ b/src/lib/test-istream-crlf.c
@@ -66,7 +66,9 @@ static void test_istream_crlf_input(const char *input)
 				test_assert(pos + (unsigned int)ret1 == size);
 				pos += ret1;
 			}
-			test_assert_idx(memcmp(data, str_data(output), size) == 0, j*10000+i);
+			if (size > 0)
+				test_assert_idx(memcmp(data, str_data(output),
+							size) == 0, j*10000+i);
 		}
 		test_assert_idx(size == str_len(output), j*10000+i);
 		i_stream_unref(&crlf_istream);