From 026b6b09d0666ddc6d3359b4a73f074b061e0da7 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 27 Apr 2020 17:03:41 +0100
Subject: [PATCH] [Minor] One more fix for spaces at the end of boundary

---
 src/libmime/mime_parser.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/libmime/mime_parser.c b/src/libmime/mime_parser.c
index 4038f59c6..590ee57d6 100644
--- a/src/libmime/mime_parser.c
+++ b/src/libmime/mime_parser.c
@@ -1108,19 +1108,26 @@ rspamd_mime_preprocess_cb (struct rspamd_multipattern *mp,
 				bend ++;
 			}
 
-			if (bend < end) {
+			while (bend < end) {
 				if (*bend == '\r') {
-					bend++;
+					bend ++;
 
 					/* \r\n */
 					if (bend < end && *bend == '\n') {
-						bend++;
+						bend ++;
 					}
 				}
-				else {
+				else if (*bend == '\n') {
 					/* \n */
-					bend++;
+					bend ++;
 				}
+				else if (g_ascii_isspace (*bend)){
+					/* Spaces in the same line, skip them */
+					bend ++;
+					continue;
+				}
+
+				break;
 			}
 
 			b.boundary = p - st->start - 2;
-- 
2.39.5