Mercurial > dovecot > core-2.2

changeset 20638:80642113d69a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-mail: stop calling str_append_n and memcmp with NULL in tests
author Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
date Mon, 25 Jul 2016 10:21:43 +0300
parents 9d4ac9940d81
children d6124d30333c
files src/lib-mail/test-istream-dot.c src/lib-mail/test-istream-header-filter.c src/lib-mail/test-message-header-parser.c src/lib-mail/test-message-parser.c
diffstat 4 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-mail/test-istream-dot.c	Wed Aug 10 15:40:23 2016 +0300
+++ b/src/lib-mail/test-istream-dot.c	Mon Jul 25 10:21:43 2016 +0300
@@ -89,7 +89,8 @@
 		test_assert(i_stream_read(input) == -1);
 
 		data = i_stream_get_data(input, &size);
-		str_append_n(str, data, size);
+		if (size > 0)
+			str_append_n(str, data, size);
 	}
 	test_assert(input->stream_errno == 0);
 	test_assert(str_len(str) == output_len);
@@ -100,7 +101,8 @@
 	(void)i_stream_read(test_input);
 	data = i_stream_get_data(test_input, &size);
 	test_assert(size == strlen(test->parent_input));
-	test_assert(memcmp(data, test->parent_input, size) == 0);
+	if (size > 0)
+		test_assert(memcmp(data, test->parent_input, size) == 0);
 
 	i_stream_unref(&test_input);
 	i_stream_unref(&input);
--- a/src/lib-mail/test-istream-header-filter.c	Wed Aug 10 15:40:23 2016 +0300
+++ b/src/lib-mail/test-istream-header-filter.c	Mon Jul 25 10:21:43 2016 +0300
@@ -425,7 +425,8 @@
 		test_assert(i_stream_read(filter) >= 0);
 
 		data = i_stream_get_data(filter, &size);
-		str_append_n(str, data, size);
+		if (size > 0)
+			str_append_n(str, data, size);
 		i_stream_skip(filter, size);
 	}
 	test_istream_set_size(istream, input_len);
--- a/src/lib-mail/test-message-header-parser.c	Wed Aug 10 15:40:23 2016 +0300
+++ b/src/lib-mail/test-message-header-parser.c	Mon Jul 25 10:21:43 2016 +0300
@@ -154,7 +154,8 @@
 {
 	if (!hdr->continued) {
 		str_append(str, hdr->name);
-		str_append_n(str, hdr->middle, hdr->middle_len);
+		if (hdr->middle_len > 0)
+			str_append_n(str, hdr->middle, hdr->middle_len);
 	}
 	str_append_n(str, hdr->value, hdr->value_len);
 	if (!hdr->no_newline) {
--- a/src/lib-mail/test-message-parser.c	Wed Aug 10 15:40:23 2016 +0300
+++ b/src/lib-mail/test-message-parser.c	Mon Jul 25 10:21:43 2016 +0300
@@ -117,7 +117,7 @@
 	while ((ret = message_parser_parse_next_block(parser, &block)) > 0) {
 		if (block.hdr != NULL)
 			message_header_line_write(output, block.hdr);
-		else
+		else if (block.size > 0)
 			str_append_n(output, block.data, block.size);
 	}