From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 31 Jul 2015 14:39:33 +0000 (+0100)
Subject: More fixes to reading of empty messages.
X-Git-Tag: 1.0.0~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=627e54de47805de8e6ae6cb1b62eb308fee2ea3a;p=thirdparty%2Frspamd.git

More fixes to reading of empty messages.
---

diff --git a/src/libmime/message.c b/src/libmime/message.c
index ea7e191bbf..83345a4d50 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -1527,13 +1527,16 @@ rspamd_message_parse (struct rspamd_task *task)
 		hdr_start = g_mime_parser_get_headers_begin (parser);
 		hdr_end = g_mime_parser_get_headers_end (parser);
 		if (hdr_start != -1 && hdr_end != -1) {
-			g_assert (hdr_start < hdr_end);
+			g_assert (hdr_start <= hdr_end);
 			g_assert (hdr_end <= (gint64)len);
 			task->raw_headers_content.begin = (gchar *)(p + hdr_start);
 			task->raw_headers_content.len = (guint64)(hdr_end - hdr_start);
-			process_raw_headers (task, task->raw_headers,
-					task->raw_headers_content.begin,
-					task->raw_headers_content.len);
+
+			if (task->raw_headers_content.len > 0) {
+				process_raw_headers (task, task->raw_headers,
+						task->raw_headers_content.begin,
+						task->raw_headers_content.len);
+			}
 		}
 
 		rspamd_images_process (task);