From bdfe95a7fb7c80d7295b1a302b6df107765592e4 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 6 Nov 2015 09:25:49 -0500 Subject: [PATCH] (fix) fixed wrong comparison of meta vs. META tag in HTML mails Conflicts: NEWS --- NEWS | 2 ++ UI/MailPartViewers/UIxMailPartHTMLViewer.m | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 14f96b5f1..01021452b 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,8 @@ Bug fixes - fix double creation of folders in Outlook when the folder name starts with a digit (Zentyal) - avoid crashing Outlook after setting a custom view in a calendar folder (Zentyal) - handle emails having an attachment as their content + - fixed JavaScript syntax error in attendees editor + - fixed wrong comparison of meta vs. META tag in HTML mails 2.3.2 (2015-09-16) ------------------ diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m index 9f156d218..e472e735a 100644 --- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m +++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m @@ -161,10 +161,10 @@ static NSData* _sanitizeContent(NSData *theData) if (i < len-5) { if ((*bytes == '<') && - (*(bytes+1) == 'm' || *(bytes+2) == 'M') && - (*(bytes+2) == 'e' || *(bytes+3) == 'E') && - (*(bytes+3) == 't' || *(bytes+4) == 'T') && - (*(bytes+4) == 'a' || *(bytes+5) == 'A') && + (*(bytes+1) == 'm' || *(bytes+1) == 'M') && + (*(bytes+2) == 'e' || *(bytes+2) == 'E') && + (*(bytes+3) == 't' || *(bytes+3) == 'T') && + (*(bytes+4) == 'a' || *(bytes+4) == 'A') && (*(bytes+5) == ' ')) in_meta = YES; }