From 0b60eebda4ab691cfef8ae6637735fcb00a57209 Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Sat, 23 Mar 2013 13:47:40 +0000 Subject: [PATCH] * Source/NSXMLNode.m (-XMLStringWithOptions:): Revert change I made on 2012-12-01. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36401 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 9 +++++++-- Source/NSXMLNode.m | 10 ++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31707b0da..bc570ec0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2012-03-20 Richard Frith-Macdonald +2013-03-23 Fred Kiefer + + * Source/NSXMLNode.m (-XMLStringWithOptions:): Revert change I + made on 2012-12-01. + +2013-03-20 Richard Frith-Macdonald * Tests/base/NSCalendar/features-10-7.m: * Source/NSCalendar.m: @@ -6,7 +11,7 @@ New OSX 10.7 methods supplied by Lobos Dolezel and rewritten somewhat to avoid breaking binary compatibility. -2012-03-17 Richard Frith-Macdonald +2013-03-17 Richard Frith-Macdonald * Source/GSSet.m: Some optimisation for set intersection. diff --git a/Source/NSXMLNode.m b/Source/NSXMLNode.m index 6fc2d071b..95d9ee172 100644 --- a/Source/NSXMLNode.m +++ b/Source/NSXMLNode.m @@ -1986,6 +1986,11 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants, int xmlOptions = 0; buffer = xmlBufferCreate(); + if (buffer == NULL) + { + // FIXME: xmlGetLastError() + return nil; + } // XML_SAVE_XHTML XML_SAVE_AS_HTML XML_SAVE_NO_DECL XML_SAVE_NO_XHTML #if LIBXML_VERSION >= 20702 @@ -2035,11 +2040,8 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants, xmlBufferFree(buffer); return nil; } -#if LIBXML_VERSION < 20900 + string = StringFromXMLString(buffer->content, buffer->use); -#else - string = StringFromXMLString(xmlBufContent(buffer), xmlBufUse(buffer)); -#endif xmlBufferFree(buffer); if ([self kind] == NSXMLTextKind)