(fix) handle more broken mails (fixes #4513)

Alinto · Jun 13, 2019 · 4fc515b · 4fc515b · Eslam-Basyouni · Jul 6, 2019
1 parent 991fac0
commit 4fc515b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -846,6 +846,13 @@ - (void) _parseContent
   if (enc == XML_CHAR_ENCODING_UTF8)
     {
       s = [[NSString alloc] initWithData: preparsedContent  encoding: NSUTF8StringEncoding];
+
+      // Again, In some rare cases (like #4513), we can get utterly broken email messages where
+      // HTML parts are wrongly encoded. We try to fall back to UTF-8 if that happens and
+      // if it still happens, we fall back to ISO-Latin-1.
+      if (!s)
+        s = [[NSString alloc] initWithData: preparsedContent  encoding: NSISOLatin1StringEncoding];
+
       preparsedContent = [[s safeString] dataUsingEncoding: NSUTF8StringEncoding];
       RELEASE(s);
     }