From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 13 Sep 2017 20:35:04 +0000 (+0300)
Subject: lib-mail: message_header_encode() cleanup - simplify pointer arithmetic
X-Git-Tag: 2.3.0.rc1~1024
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3226cfcb9aed8fcf1582fbe3dce40bbb6532536f;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: message_header_encode() cleanup - simplify pointer arithmetic

This should make static analyzers happier.
---

diff --git a/src/lib-mail/message-header-encode.c b/src/lib-mail/message-header-encode.c
index 4fef8f4fa4..c8586e9870 100644
--- a/src/lib-mail/message-header-encode.c
+++ b/src/lib-mail/message-header-encode.c
@@ -194,9 +194,11 @@ void message_header_encode_data(const unsigned char *input, unsigned int len,
 	   recursively. */
 	next_line_input = memchr(input, '\n', len);
 	if (next_line_input != NULL) {
-		if (next_line_input != input && next_line_input[-1] == '\r')
-			next_line_input--;
 		cur_line_len = next_line_input - input;
+		if (cur_line_len > 0 && input[cur_line_len-1] == '\r') {
+			cur_line_len--;
+			next_line_input = input + cur_line_len;
+		}
 		next_line_len = len - cur_line_len;
 		len = cur_line_len;
 	}