From c815ae549b2611c007fdeed2ca8b0cc53a9a54aa Mon Sep 17 00:00:00 2001
From: Wolfgang Lux <wolfgang.lux@gmail.com>
Date: Tue, 16 Feb 2010 12:46:50 +0000
Subject: [PATCH] Fix bug where GSToUnicode attempted to read from a null
 pointer.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29651 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                  | 5 +++++
 Source/Additions/Unicode.m | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 578f52a77..2e2a6991f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-16  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/Additions/Unicode.m (GSToUnicode): Fix bug where
+	GSToUnicode attempted to read from a null pointer.
+
 2010-02-15 Richard Frith-Macdonald <rfm@gnu.org>
 
 	Various reorganisation tweaks.
diff --git a/Source/Additions/Unicode.m b/Source/Additions/Unicode.m
index 8618d0c60..fa48086d3 100644
--- a/Source/Additions/Unicode.m
+++ b/Source/Additions/Unicode.m
@@ -1490,7 +1490,7 @@ done:
 	}
     }
 #if	!GS_WITH_GC
-  else if (ptr != buf && ptr != *dst)
+  else if (ptr != buf && (dst == 0 || ptr != *dst))
     {
       NSZoneFree(zone, ptr);
     }