From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 27 Jan 2020 19:25:50 +0000 (+0000)
Subject: [Minor] Oops, fix more stuff
X-Git-Tag: 2.3~33
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=58b5048924664bd913b0b275e61dea9a088b17e7;p=rspamd.git

[Minor] Oops, fix more stuff
---

diff --git a/src/libmime/mime_encoding.c b/src/libmime/mime_encoding.c
index 646b31eae..a91447ab6 100644
--- a/src/libmime/mime_encoding.c
+++ b/src/libmime/mime_encoding.c
@@ -724,10 +724,15 @@ rspamd_mime_text_part_maybe_convert (struct rspamd_task *task,
 			}
 		}
 		else {
-			/*
-			 * We have detected some charset, but we don't know which one
-			 */
-			valid_utf8 = FALSE;
+			text_part->real_charset = charset;
+
+			if (strcmp (charset, UTF8_CHARSET) != 0) {
+				/*
+				 * We have detected some charset, but we don't know which one,
+				 * so we need to reset valid utf8 flag and enforce it later
+				 */
+				valid_utf8 = FALSE;
+			}
 		}
 	}