From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 25 Jul 2015 19:45:45 +0000 (+0100)
Subject: Fix parsing of the last header in a message.
X-Git-Tag: 1.0.0~288
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ed2a7526b4448a4b1db24149378bdaa4ffd4a8c;p=thirdparty%2Frspamd.git

Fix parsing of the last header in a message.

Issue:	#339
Reported by:	@patrakov
---

diff --git a/src/libmime/message.c b/src/libmime/message.c
index 96e22545cd..c35bc6772f 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -402,7 +402,7 @@ process_raw_headers (struct rspamd_task *task, GHashTable *target,
 	end = p + len;
 	c = p;
 
-	while (p < end) {
+	while (p <= end) {
 		/* FSM for processing headers */
 		switch (state) {
 		case 0:
@@ -485,7 +485,7 @@ process_raw_headers (struct rspamd_task *task, GHashTable *target,
 				next_state = 3;
 				err_state = 4;
 			}
-			else if (*(p + 1) == '\0') {
+			else if (p + 1 == end) {
 				state = 4;
 			}
 			else {
@@ -525,6 +525,7 @@ process_raw_headers (struct rspamd_task *task, GHashTable *target,
 			if (*(tp - 1) == ' ') {
 				tp--;
 			}
+
 			*tp = '\0';
 			new->value = tmp;
 			new->decoded = g_mime_utils_header_decode_text (new->value);
@@ -542,7 +543,7 @@ process_raw_headers (struct rspamd_task *task, GHashTable *target,
 			break;
 		case 99:
 			/* Folding state */
-			if (*(p + 1) == '\0') {
+			if (p + 1 == end) {
 				state = err_state;
 			}
 			else {
@@ -584,7 +585,7 @@ process_raw_headers (struct rspamd_task *task, GHashTable *target,
 				p++;
 				state = next_state;
 			}
-			else if (*(p + 1) == '\0') {
+			else if (p + 1 == end) {
 				state = next_state;
 				p++;
 			}