From bc05f2660bf6d5baddd65d9365a2c33838422bf3 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 23 Feb 2017 15:03:50 +0000 Subject: [PATCH] [Fix] Stop processing of bad parts as text parts --- src/libmime/message.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libmime/message.c b/src/libmime/message.c index c84b63360c..616a798e15 100644 --- a/src/libmime/message.c +++ b/src/libmime/message.c @@ -443,6 +443,10 @@ rspamd_message_process_text_part (struct rspamd_task *task, part_content = rspamd_mime_text_part_maybe_convert (task, text_part); + if (part_content == NULL) { + return; + } + text_part->html = rspamd_mempool_alloc0 (task->task_pool, sizeof (*text_part->html)); text_part->mime_part = mime_part; @@ -485,7 +489,14 @@ rspamd_message_process_text_part (struct rspamd_task *task, text_part->content = rspamd_mime_text_part_maybe_convert (task, text_part); - g_ptr_array_add (task->text_parts, text_part); + + if (text_part->content == NULL) { + /* + * We ignore unconverted parts from now as it is dangerous + * to treat them as text parts + */ + g_ptr_array_add (task->text_parts, text_part); + } } -- 2.47.3