From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 17 Nov 2017 18:53:41 +0000 (+0200)
Subject: lib-dcrypt: test-stream - Make static analyzer happier
X-Git-Tag: 2.3.0.rc1~437
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcf23eed0f43d4a0bff450fddb283f4cd7e645a0;p=thirdparty%2Fdovecot%2Fcore.git

lib-dcrypt: test-stream - Make static analyzer happier

Without this clang thinks it's possible that siz>sizeof(payload).
---

diff --git a/src/lib-dcrypt/test-stream.c b/src/lib-dcrypt/test-stream.c
index 0c071be911..b096e540ed 100644
--- a/src/lib-dcrypt/test-stream.c
+++ b/src/lib-dcrypt/test-stream.c
@@ -265,7 +265,7 @@ void test_write_read_v1_short(void)
 			test_istream_set_size(is, ++offset);
 
 		test_assert_idx(pos + siz <= sizeof(payload), pos);
-		if (pos + siz > sizeof(payload)) break;
+		if (siz > sizeof(payload) || pos + siz > sizeof(payload)) break;
 		test_assert_idx(siz == 0 || memcmp(ptr, payload + pos, siz) == 0, pos);
 		i_stream_skip(is_2, siz); pos += siz;
 	}
@@ -406,7 +406,7 @@ void test_write_read_v2_short(void)
 		test_istream_set_size(is, ++offset);
 
 		test_assert_idx(pos + siz <= sizeof(payload), pos);
-		if (pos + siz > sizeof(payload)) break;
+		if (siz > sizeof(payload) || pos + siz > sizeof(payload)) break;
 		test_assert_idx(siz == 0 || memcmp(ptr, payload + pos, siz) == 0, pos);
 		i_stream_skip(is_2, siz); pos += siz;
 	}