From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sat, 19 Nov 2016 00:00:25 +0000 (+0200)
Subject: global: Avoid unnecessary unsigned integer wraps.
X-Git-Tag: 2.2.27~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dc068f46bfea9a00c69f648724a970fd597cb1f;p=thirdparty%2Fdovecot%2Fcore.git

global: Avoid unnecessary unsigned integer wraps.

Avoids complains from clang -fsanitize=integer
---

diff --git a/src/indexer/master-connection.c b/src/indexer/master-connection.c
index 2f516a218a..87baa58442 100644
--- a/src/indexer/master-connection.c
+++ b/src/indexer/master-connection.c
@@ -88,7 +88,7 @@ index_mailbox_precache(struct master_connection *conn, struct mailbox *box)
 				  metadata.precache_fields, NULL);
 	mail_search_args_unref(&search_args);
 
-	max = status.messages - seq + 1;
+	max = status.messages + 1 - seq;
 	while (mailbox_search_next(ctx, &mail)) {
 		mail_precache(mail);
 		if (++counter % 100 == 0) {
diff --git a/src/lib-mail/test-istream-header-filter.c b/src/lib-mail/test-istream-header-filter.c
index 14bdb67f90..8747d564b0 100644
--- a/src/lib-mail/test-istream-header-filter.c
+++ b/src/lib-mail/test-istream-header-filter.c
@@ -499,7 +499,7 @@ static void test_istream_hide_body(void)
 	for (i = 0; i < N_ELEMENTS(tests); i++) {
 		istream = test_istream_create(tests[i].input);
 		test_istream_run(istream,
-				 strlen(tests[i].input) + tests[i].extra,
+				 (int)strlen(tests[i].input) + tests[i].extra,
 				 tests[i].output,
 				 HEADER_FILTER_EXCLUDE |
 				 HEADER_FILTER_CRLF_PRESERVE |
diff --git a/src/lib-storage/index/mbox/istream-raw-mbox.c b/src/lib-storage/index/mbox/istream-raw-mbox.c
index 5b1ae30869..aa59a76354 100644
--- a/src/lib-storage/index/mbox/istream-raw-mbox.c
+++ b/src/lib-storage/index/mbox/istream-raw-mbox.c
@@ -301,9 +301,9 @@ static ssize_t i_stream_raw_mbox_read(struct istream_private *stream)
 					from_start_pos = i - 6;
 				}
 
-				if (rstream->hdr_offset + rstream->mail_size ==
-				    stream->istream.v_offset + from_start_pos ||
-				    rstream->mail_size == (uoff_t)-1) {
+				if (rstream->mail_size == (uoff_t)-1 ||
+				    rstream->hdr_offset + rstream->mail_size ==
+				    stream->istream.v_offset + from_start_pos) {
 					from_after_pos = i;
 					if (ret == -2) {
 						/* even if we don't have the