From ca6e467891c326d8fd32e021bdd4de6f21adcb4d Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sat, 21 Oct 2017 14:53:17 +0100 Subject: [PATCH] [CritFix] Fix newlines detection MFH: rspamd-1.6 --- src/libmime/message.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libmime/message.c b/src/libmime/message.c index fe2cdbdae..36ce710fc 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) { -- 2.39.5