From c5bd50b2dbe756261cea19f2033a671e467e2d18 Mon Sep 17 00:00:00 2001 From: dwetzel Date: Wed, 9 Jun 2010 20:40:41 +0000 Subject: [PATCH] * Source/Additions/GSXML.m: check for NULL string stringWithUTF8String: raises on OSX if you feed it with a NULL string. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30641 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/Additions/GSXML.m | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 743fd0c69..cde34b41e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-06-09 David Wetzel + * Source/Additions/GSXML.m: + check for NULL string + stringWithUTF8String: raises on OSX if you feed it with a NULL string. + 2010-06-09 Richard Frith-Macdonald * configure.ac: Check for gcrypt library for TLS diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m index f527a1439..76b546893 100644 --- a/Source/Additions/GSXML.m +++ b/Source/Additions/GSXML.m @@ -120,6 +120,10 @@ static SEL usSel; inline static NSString* UTF8Str(const unsigned char *bytes) { + // stringWithUTF8String: raises on OSX if you feed it with a NULL string. + if ((bytes == NULL)) { + return nil; + } return (*usImp)(NSString_class, usSel, bytes); }