From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Tue, 8 Dec 2020 07:45:20 +0000 (+0200)
Subject: lib-mail: test-message-search - Assert that found value is not NULL
X-Git-Tag: 2.3.14.rc1~223
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73b307d6ff505b134ff07dade6fa9325506fd2ac;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: test-message-search - Assert that found value is not NULL

Satisfies static analysers
---

diff --git a/src/lib-mail/test-message-search.c b/src/lib-mail/test-message-search.c
index a85dec5a5b..ca86d973c3 100644
--- a/src/lib-mail/test-message-search.c
+++ b/src/lib-mail/test-message-search.c
@@ -39,13 +39,15 @@ static void compare_search_result(const struct test_case *tc,
 		/* found header */
 		test_assert_idx(tc->expect_header == TRUE, i);
 		test_assert_strcmp_idx(tc->hdr_name, block->hdr->name, i);
-		test_assert_idx(tc->output.value_len <= block->hdr->full_value_len &&
+		test_assert_idx(block->hdr->full_value != NULL &&
+				tc->output.value_len <= block->hdr->full_value_len &&
 				memcmp(tc->output.value, block->hdr->full_value,
 				       tc->output.value_len) == 0, i);
 	} else if (block->data != NULL) {
 		/* found body */
 		test_assert_idx(tc->expect_body == TRUE, i);
-		test_assert_idx(tc->output.value_len <= block->size &&
+		test_assert_idx(block->data != NULL &&
+				tc->output.value_len <= block->size &&
 				memcmp(tc->output.value, block->data,
 				       tc->output.value_len) == 0, i);
 	} else {