From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 13 Sep 2017 20:26:49 +0000 (+0300)
Subject: global: Add asserts to help static analyzers
X-Git-Tag: 2.3.0.rc1~1025
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4e097fbc4deecd044dd43bc497048c79fd9861b;p=thirdparty%2Fdovecot%2Fcore.git

global: Add asserts to help static analyzers
---

diff --git a/src/lib-mail/message-size.c b/src/lib-mail/message-size.c
index 3c90c023ee..7067710388 100644
--- a/src/lib-mail/message-size.c
+++ b/src/lib-mail/message-size.c
@@ -166,6 +166,7 @@ int message_skip_virtual(struct istream *input, uoff_t virtual_skip,
 		if (i < size)
 			return 0;
 
+		i_assert(i > 0);
 		cr_skipped = msg[i-1] == '\r';
 	}
 	i_assert(ret == -1);
diff --git a/src/lib/str-sanitize.c b/src/lib/str-sanitize.c
index 3b6d650dec..c28d63f020 100644
--- a/src/lib/str-sanitize.c
+++ b/src/lib/str-sanitize.c
@@ -29,6 +29,8 @@ static void str_sanitize_truncate_char(string_t *dest, unsigned int initial_pos)
 
 	if (len == initial_pos)
 		return;
+
+	i_assert(len > 0);
 	if ((data[len-1] & 0x80) == 0) {
 		str_truncate(dest, len-1);
 		return;