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

See ChangeLog 

Monotone-Parent: c3154515eeade57787d4fb276b1cd5ba9bd7488d
Monotone-Revision: 0942f75d4ff9b5111c95d1cd9bee0a65f57f888b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-08-24T19:58:04
maint-2.0.2
Francis Lachapelle 2012-08-24 19:58:04 +00:00
parent 8530f7950d
commit 6bf0a28c5c
2 changed files with 105 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2012-08-24 Francis Lachapelle <flachapelle@inverse.ca>
* UI/MailPartViewers/UIxMailPartHTMLViewer.m (_sanitizeContent):
fix invalid void tags to insure proper HTML decoding. Fixes #1581.
2012-08-07 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Contacts/UIxListEditor.m (-setReferencesValue:): check for

110
UI/MailPartViewers/UIxMailPartHTMLViewer.m
View File

@ -55,7 +55,7 @@
static NSArray *BannedTags = nil;
/* Tags that can't have any contents (no end tag) */
static NSArray *VoidTags = nil;
static NSArray *VoidTags= nil;
static xmlCharEncoding
_xmlCharsetForCharset (NSString *charset)
@ -141,14 +141,16 @@ _xmlCharsetForCharset (NSString *charset)
static NSData* _sanitizeContent(NSData *theData)
{
NSMutableData *d;
NSString *found_tag, *tag;
NSEnumerator *tags;
const char *bytes;
char *buf;
int i, j, len;
BOOL seen_head;
BOOL found_delimiter;
d = [NSMutableData dataWithData: theData];
bytes = [d bytes];
len = [d length];
seen_head = NO;
i = 0;
while (i < len)
@ -164,14 +166,14 @@ static NSData* _sanitizeContent(NSData *theData)
(*(bytes+3) == 'a' || *(bytes+3) == 'A') &&
(*(bytes+4) == 'd' || *(bytes+4) == 'D') &&
(*(bytes+7) == '>'))
seen_head = YES;
break;
}
// We search for something like :
//
// <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
//
if (!seen_head && i < len-9)
if (i < len-9)
{
if ((*bytes == 'c' || *bytes == 'C') &&
(*(bytes+1) == 'h' || *(bytes+1) == 'H') &&
@ -184,6 +186,7 @@ static NSData* _sanitizeContent(NSData *theData)
{
// We search until we find a '"' or a space
j = 8;
found_delimiter = YES;
while (*(bytes+j) != ' ' && *(bytes+j) != '"')
{
@ -191,12 +194,16 @@ static NSData* _sanitizeContent(NSData *theData)
// We haven't found anything, let's return the data untouched
if ((i+j) >= len)
return theData;
{
found_delimiter = NO;
break;
}
}
[d replaceBytesInRange: NSMakeRange(i, j)
withBytes: NULL
length: 0];
if (found_delimiter)
[d replaceBytesInRange: NSMakeRange(i, j)
withBytes: NULL
length: 0];
break;
}
}
@ -204,6 +211,89 @@ static NSData* _sanitizeContent(NSData *theData)
bytes++;
i++;
}
/*
* Replace badly formatted void tags
*
* A void tag that begins with a slash is considered invalid.
* We remove the slash from those tags.
*
* Ex: </br> is replaced by <br>
*/
if (!VoidTags)
{
/* see http://www.w3.org/TR/html4/index/elements.html */
VoidTags = [[NSArray alloc] initWithObjects: @"area", @"base",
@"basefont", @"br", @"col", @"frame", @"hr",
@"img", @"input", @"isindex", @"link",
@"meta", @"param", @"", nil];
}
bytes = [d bytes];
len = [d length];
i = 0;
while (i < len)
{
if (i < len-3)
{
// Search for ending tags
if ((*bytes == '<') && (*(bytes+1) == '/'))
{
i += 2;
bytes += 2;
j = 0;
found_delimiter = YES;
while (*(bytes+j) != '>')
{
j++;
if ((i+j) >= len)
{
found_delimiter = NO;
break;
}
}
if (found_delimiter && j > 0)
{
// Copy the ending tag to a NSString
buf = malloc((j+1) * sizeof(char));
memset (buf, 0, j+1);
memcpy (buf, bytes, j);
found_tag = [NSString stringWithCString: buf encoding: NSASCIIStringEncoding];
tags = [VoidTags objectEnumerator];
tag = [tags nextObject];
while (tag)
{
if ([tag caseInsensitiveCompare: found_tag] == NSOrderedSame)
{
// Remove the leading slash
NSLog(@"Found void tag with invalid leading slash: </%@>", found_tag);
i--;
[d replaceBytesInRange: NSMakeRange(i, 1)
withBytes: NULL
length: 0];
bytes = [d bytes];
bytes += i;
len = [d length];
break;
}
tag = [tags nextObject];
}
free(buf);
// Continue the parsing after end tag
i += j;
bytes += j;
}
}
}
bytes++;
i++;
}
return d;
}