LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(mail): wrap HTML part before re-encoding content 

Avoid improper encoding when the HTML part is using an unsupported
encoding by libxml2.
pull/270/head
Francis Lachapelle 2020-01-30 15:36:16 -05:00
parent 127a3c487d
commit bc963d53c6
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
UI/MailPartViewers/UIxMailPartHTMLViewer.m
View File

@ -811,6 +811,14 @@ _xmlCharsetForCharset (NSString *charset)
handler = [_UIxHTMLMailContentHandler new]; handler = [_UIxHTMLMailContentHandler new];
[handler setAttachmentIds: attachmentIds]; [handler setAttachmentIds: attachmentIds];
// Some broken email messages have some additionnal content outside the main HTML tags which are
// ignored by libxml.
// We surround the whole part with additional HTML tags to render all content.
htmlContent = [NSMutableData dataWithBytes: "<html>" length: 6];
[htmlContent appendData: preparsedContent];
[htmlContent appendBytes: "</html>" length: 7];
preparsedContent = (NSData *)htmlContent;
// We check if we got an unsupported charset. If so // We check if we got an unsupported charset. If so
// we convert everything to UTF-16{LE,BE} so it passes // we convert everything to UTF-16{LE,BE} so it passes
// in libxml2 and also in characters: length: defined // in libxml2 and also in characters: length: defined
@ -859,17 +867,10 @@ _xmlCharsetForCharset (NSString *charset)
RELEASE(s); RELEASE(s);
} }
// Some broken email messages have some additionnal content outside the main HTML tags which are
// ignored by libxml.
// We surround the whole part with additional HTML tags to render all content.
htmlContent = [NSMutableData dataWithBytes: "<html>" length: 6];
[htmlContent appendData: preparsedContent];
[htmlContent appendBytes: "</html>" length: 7];
[handler setContentEncoding: enc]; [handler setContentEncoding: enc];
[parser setContentHandler: handler]; [parser setContentHandler: handler];
[parser parseFromSource: htmlContent]; [parser parseFromSource: preparsedContent];
} }
- (NSString *) cssContent - (NSString *) cssContent