From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 21 Oct 2017 13:53:17 +0000 (+0100)
Subject: [CritFix] Fix newlines detection
X-Git-Tag: 1.7.0~530
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca6e467891c326d8fd32e021bdd4de6f21adcb4d;p=thirdparty%2Frspamd.git

[CritFix] Fix newlines detection

MFH: rspamd-1.6
---

diff --git a/src/libmime/message.c b/src/libmime/message.c
index fe2cdbdae9..36ce710fc3 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -413,6 +413,8 @@ rspamd_strip_newlines_parse (const gchar *begin, const gchar *pe,
 				if (IS_PART_HTML (part) || g_ascii_ispunct (last_c)) {
 					g_byte_array_append (part->stripped_content,
 							(const guint8 *)" ", 1);
+					g_ptr_array_add (part->newlines,
+							(((gpointer) (goffset) (part->stripped_content->len))));
 					crlf_added = TRUE;
 				}
 				else {
@@ -488,6 +490,11 @@ rspamd_strip_newlines_parse (const gchar *begin, const gchar *pe,
 			case seen_lf:
 				part->nlines ++;
 
+				if (!crlf_added) {
+					g_ptr_array_add (part->newlines,
+							(((gpointer) (goffset) (part->stripped_content->len))));
+				}
+
 				/* Skip initial spaces */
 				if (G_UNLIKELY (*p == ' ')) {
 					if (!crlf_added) {