From 4968865af9b9337afda1f673637fcc85d8c1b820 Mon Sep 17 00:00:00 2001 From: Marco Bettini Date: Tue, 18 Jul 2023 08:35:12 +0000 Subject: [PATCH] lib: test_istream_jsonstr_partial() - Rearrange code to prevent unspecified order of evaluation Found by Coverity --- src/lib/test-istream-jsonstr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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); -- 2.47.3