From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 18 Dec 2016 17:14:54 +0000 (+0000)
Subject: [Fix] Fix processing of non-multipart messages
X-Git-Tag: 1.5.0~558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5efc6ae1edae1fa5da02daff68d41fc5f4bac5fd;p=thirdparty%2Frspamd.git

[Fix] Fix processing of non-multipart messages
---

diff --git a/src/libmime/mime_parser.c b/src/libmime/mime_parser.c
index 99ee485a3f..ca31bac8c0 100644
--- a/src/libmime/mime_parser.c
+++ b/src/libmime/mime_parser.c
@@ -692,8 +692,8 @@ rspamd_mime_preprocess_cb (struct rspamd_multipattern *mp,
 				bend ++;
 			}
 
-			b.boundary = p - text - 3;
-			b.start = bend - text - 1;
+			b.boundary = p - st->start - 3;
+			b.start = bend - st->start - 1;
 
 			lc_copy = g_malloc (blen);
 			memcpy (lc_copy, p, blen);
@@ -825,7 +825,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
 					"Content-Type", FALSE);
 		}
 
-		pbegin = st->pos;
+		pbegin = st->start + body_pos;
 		plen = st->end - pbegin;
 		npart->raw_headers = g_hash_table_ref (task->raw_headers);
 	}