From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 26 May 2016 11:55:24 +0000 (+0100)
Subject: [Fix] Another fix for exim workaround
X-Git-Tag: 1.3.0~434
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c51852e35947662f09abf878c879bf44296ae49f;p=rspamd.git

[Fix] Another fix for exim workaround

Issue: #637
Reported by: @FelixSchwarz
---

diff --git a/src/libmime/message.c b/src/libmime/message.c
index 5b7c4ae2f..b20da368a 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -1663,6 +1663,7 @@ rspamd_message_parse (struct rspamd_task *task)
 				/* Skip to CRLF */
 				msg_info_task ("mailbox input detected, enable workaround");
 				p += sizeof ("From ") - 1;
+				len -= sizeof ("From ") - 1;
 
 				while (len > 0 && *p != '\n') {
 					p ++;
@@ -1678,6 +1679,8 @@ rspamd_message_parse (struct rspamd_task *task)
 
 	tmp->data = (guint8 *)p;
 	tmp->len = len;
+	task->msg.begin = p;
+	task->msg.len = len;
 
 	stream = g_mime_stream_mem_new_with_byte_array (tmp);
 	/*