From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 2 Oct 2019 12:08:22 +0000 (+0100)
Subject: [Fix] Do not assert if we have broken mime boundary in the headers
X-Git-Tag: 2.0~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c729c2b12ead68bcf11a3adfa6e465b0fae884f;p=thirdparty%2Frspamd.git

[Fix] Do not assert if we have broken mime boundary in the headers
---

diff --git a/src/libmime/mime_parser.c b/src/libmime/mime_parser.c
index 1c132335cf..517bc4b8db 100644
--- a/src/libmime/mime_parser.c
+++ b/src/libmime/mime_parser.c
@@ -688,10 +688,11 @@ rspamd_mime_parse_multipart_cb (struct rspamd_task *task,
 		st->pos = cb->part_start;
 	}
 	else {
-		/* We have seen the start of the boundary */
-		if (cb->part_start < pos) {
-			/* We should have seen some boundary */
-			g_assert (cb->cur_boundary != NULL);
+		/*
+		 * We have seen the start of the boundary,
+		 * but it might be unsuitable (e.g. in broken headers)
+		 */
+		if (cb->part_start < pos && cb->cur_boundary) {
 
 			if ((ret = rspamd_mime_process_multipart_node (task, cb->st,
 					cb->multipart, cb->part_start, pos, TRUE, cb->err))