From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 21 Oct 2019 14:31:15 +0000 (+0100)
Subject: [Minor] Do not try to parse non-trivial parts as text parts
X-Git-Tag: 2.1~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66468690e6caa0ada83d1d6707d3c58b1487ea87;p=thirdparty%2Frspamd.git

[Minor] Do not try to parse non-trivial parts as text parts
---

diff --git a/src/libmime/message.c b/src/libmime/message.c
index 0785a35703..cfa8cf97de 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -1433,7 +1433,8 @@ rspamd_message_process (struct rspamd_task *task)
 			lua_settop (L, func_pos);
 		}
 
-		if (!(part->flags & (RSPAMD_MIME_PART_IMAGE|RSPAMD_MIME_PART_ARCHIVE))) {
+		if (!(part->flags & (RSPAMD_MIME_PART_IMAGE|RSPAMD_MIME_PART_ARCHIVE)) &&
+				(!part->ct || !(part->ct->flags & (RSPAMD_CONTENT_TYPE_MULTIPART|RSPAMD_CONTENT_TYPE_MESSAGE)))) {
 			rspamd_message_process_text_part_maybe (task, part);
 		}
 	}