From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Tue, 18 Jul 2023 08:35:12 +0000 (+0000)
Subject: lib: test_istream_jsonstr_partial() - Rearrange code to prevent unspecified order... 
X-Git-Tag: 2.4.0~2633
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4968865af9b9337afda1f673637fcc85d8c1b820;p=thirdparty%2Fdovecot%2Fcore.git

lib: test_istream_jsonstr_partial() - Rearrange code to prevent unspecified order of evaluation

Found by Coverity
---

diff --git a/src/lib/test-istream-jsonstr.c b/src/lib/test-istream-jsonstr.c
index 626994d6a7..7b432e893c 100644
--- a/src/lib/test-istream-jsonstr.c
+++ b/src/lib/test-istream-jsonstr.c
@@ -116,8 +116,9 @@ static void test_istream_jsonstr_partial(void)
 	test_assert(i_stream_read(input) == 2);
 	test_assert(i_stream_read(input) == -1);
 
-	test_assert(memcmp(i_stream_get_data(input, &len), output, I_MIN(len, strlen(output))) == 0 &&
-		    len == strlen(output));
+	const unsigned char *data = i_stream_get_data(input, &len);
+	test_assert_cmp(len, ==, strlen(output));
+	test_assert_strcmp((const char*) data, output);
 
 	i_stream_unref(&input);
 	i_stream_unref(&input_data);