lib-mail: stop calling str_append_n and memcmp with NULL in tests

diff --git a/src/lib-mail/test-istream-dot.c b/src/lib-mail/test-istream-dot.c
index eed32bd6f820afc95080d9434e048bc74214e989..a71fefd3bca5f594273814cf3ca72a106a5ad4b1 100644 (file)
--- a/src/lib-mail/test-istream-dot.c
+++ b/src/lib-mail/test-istream-dot.c
@@ -89,7 +89,8 @@ static void test_istream_dot_one(const struct dot_test *test,
                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 @@ static void test_istream_dot_one(const struct dot_test *test,
        (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);

diff --git a/src/lib-mail/test-istream-header-filter.c b/src/lib-mail/test-istream-header-filter.c
index 46c90ca93fb7374080bd89a39f4b6b8579624b23..14bdb67f90ed5bb6fef9cdf3ebbb79e2da9133ee 100644 (file)
--- a/src/lib-mail/test-istream-header-filter.c
+++ b/src/lib-mail/test-istream-header-filter.c
@@ -425,7 +425,8 @@ static void test_istream_end_body_with_lf(void)
                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);

diff --git a/src/lib-mail/test-message-header-parser.c b/src/lib-mail/test-message-header-parser.c
index 45508fb771e27a86503731e639f0a78a1a8de408..6cafa86bced883df45a397bcde8b993b4fde6e54 100644 (file)
--- a/src/lib-mail/test-message-header-parser.c
+++ b/src/lib-mail/test-message-header-parser.c
@@ -154,7 +154,8 @@ static void hdr_write(string_t *str, struct message_header_line *hdr)
 {
        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) {

diff --git a/src/lib-mail/test-message-parser.c b/src/lib-mail/test-message-parser.c
index 66360d4905334ca17eed7e360e93281b23d1a128..0f57d2701dae673fea0bc564ec673f897a984b8d 100644 (file)
--- a/src/lib-mail/test-message-parser.c
+++ b/src/lib-mail/test-message-parser.c
@@ -117,7 +117,7 @@ static void test_message_parser_small_blocks(void)
        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);
        }