gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix to handle empty key in XML property list.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28435 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-08-04 07:47:58 +00:00
parent 9d4d268acd
commit ec72fa58ba
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-08-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPropertyList.m: Fix for handling empty key values in
XML property lists.
2009-08-03 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSObject.m: Fix error in memory allocation debug when

11
Source/NSPropertyList.m
View file

@ -233,8 +233,15 @@ extern BOOL GSScanDouble(unichar*, unsigned, double*);
}
else if ([elementName isEqualToString: @"key"] == YES)
{
ASSIGN(key, [value makeImmutableCopyOnFail: NO]);
DESTROY(value);
if (value == nil)
{
ASSIGN(key, @""); // Empty key.
}
else
{
ASSIGN(key, [value makeImmutableCopyOnFail: NO]);
DESTROY(value);
}
return;
}
else if ([elementName isEqualToString: @"data"])

2
Source/NSXMLParser.m
View file

@ -1504,7 +1504,7 @@ NSLog(@"_processTag <%@%@ %@>", flag?@"/": @"", tag, attributes);
}
}
}
return [self _parseError: @"this->aborted"
return [self _parseError: @"aborted"
code: NSXMLParserDelegateAbortedParseError];
}