From 882abe8e74ea6bb1bfd313337a04176c63f026a9 Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Wed, 19 Jan 2011 09:21:23 +0000 Subject: [PATCH] Fix error handling whitespace in xml git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31910 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSPropertyList.m | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f6f012201..10aefe19b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-01-18 Richard Frith-Macdonald + + * Source/NSPropertyList.m: Fix to cope with NSXMLParser reporting + whitespace as character data. + 2011-01-18 Richard Frith-Macdonald * Source/NSPropertyList.m: For OSX compatibility we now quote strings diff --git a/Source/NSPropertyList.m b/Source/NSPropertyList.m index 843b82ed0..504847e2b 100644 --- a/Source/NSPropertyList.m +++ b/Source/NSPropertyList.m @@ -144,7 +144,14 @@ extern BOOL GSScanDouble(unichar*, unsigned, double*); - (void) parser: (NSXMLParser *)parser foundCharacters: (NSString *)string { - [value appendString: string]; + if (YES == inString) + { + [value appendString: string]; + } + else + { + [value appendString: [string stringByTrimmingSpaces]]; + } } - (void) parser: (NSXMLParser *)parser