gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 03:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid potential illegal access violation introduced with the previous

Browse source 
commit.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30775 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2010-06-18 17:03:55 +00:00
parent fc60476d53
commit 081fc4e701
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Source/NSAttributedString.m
View file

@ -766,25 +766,31 @@ create_error(int code, NSString* desc)
if (type == nil)
{
const void *dataBytes = [data bytes];
// Make sure this buffer is long enough
char prefix[14];
NSUInteger l = [data length];
if (l < sizeof(prefix))
{
[data getBytes: prefix length: l];
prefix[l] = 0;
}
else
{
[data getBytes: prefix length: sizeof(prefix)];
}
// The list of file types below was derived from Apache's conf/magic file
// FIXME extend the list
if (strncmp(dataBytes, "{\\rtf", 5) == 0)
if (strncmp(prefix, "{\\rtf", 5) == 0)
{
type = NSRTFTextDocumentType;
}
else if (strncmp(dataBytes, "<!DOCTYPE HTML", 14) == 0 ||
strncmp(dataBytes, "<!doctype html", 14) == 0 ||
strncmp(dataBytes, "<HEAD", 5) == 0 ||
strncmp(dataBytes, "<head", 5) == 0 ||
strncmp(dataBytes, "<TITLE", 6) == 0 ||
strncmp(dataBytes, "<title", 6) == 0 ||
strncmp(dataBytes, "<HTML", 5) == 0 ||
strncmp(dataBytes, "<html", 5) == 0 ||
strncmp(dataBytes, "<!--", 4) == 0 ||
strncmp(dataBytes, "<h1", 3) == 0 ||
strncmp(dataBytes, "<H1", 3) == 0)
else if (strncasecmp(prefix, "<!doctype html", 14) == 0 ||
strncasecmp(prefix, "<head", 5) == 0 ||
strncasecmp(prefix, "<title", 6) == 0 ||
strncasecmp(prefix, "<html", 5) == 0 ||
strncmp(prefix, "<!--", 4) == 0 ||
strncasecmp(prefix, "<h1", 3) == 0)
{
type = NSHTMLTextDocumentType;
}