From baf0ff4254690f510845684ba9610f544096a53e Mon Sep 17 00:00:00 2001
From: mguesdon <mguesdon@72102866-910b-0410-8b05-ffd578937521>
Date: Sun, 11 Feb 2001 22:45:01 +0000
Subject: [PATCH] 2001-02-11  Manuel Guesdon <mguesdon@orange-concept.com>

	* GSXML.m: testing lib!=NULL and string!=NULL before doing something in
                -GSXMLNode content
                -GSXMLNode name
                -GSXMLNode ns
                -GSXMLNode nsDef
	* NSString.m: handle NULL bytes in -initWithUTF8String: (Treat it as zero
		length string and NSDebugMLog a warning).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@9124 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog         | 10 ++++++++++
 Source/GSXML.m    |  8 ++++----
 Source/NSString.m |  8 +++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8f554b5c..ef77b8da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-11  Manuel Guesdon <mguesdon@orange-concept.com>
+
+	* GSXML.m: testing lib!=NULL and string!=NULL before doing something in 
+                -GSXMLNode content
+                -GSXMLNode name
+                -GSXMLNode ns
+                -GSXMLNode nsDef
+	* NSString.m: handle NULL bytes in -initWithUTF8String: (Treat it as zero 
+		length string and NSDebugMLog a warning).
+
 2001-02-09  Jonathan Gapen  <jagapen@home.com>
 
 	More FreeBSD build fixes:
diff --git a/Source/GSXML.m b/Source/GSXML.m
index 500ab3857..25b7166db 100644
--- a/Source/GSXML.m
+++ b/Source/GSXML.m
@@ -531,7 +531,7 @@ static NSMapTable	*nodeNames = 0;
 
 - (NSString*) content
 {
-  if (((xmlNodePtr)lib)->content != NULL)
+  if (lib != NULL && ((xmlNodePtr)lib)->content!=NULL)
     {
       return UTF8Str(((xmlNodePtr)lib)->content);
     }
@@ -543,7 +543,7 @@ static NSMapTable	*nodeNames = 0;
 
 - (NSString*) name
 {
-  if (lib != NULL)
+  if (lib != NULL && ((xmlNodePtr)lib)->name!=NULL)
     {
       return UTF8Str(((xmlNodePtr)lib)->name);
     }
@@ -555,7 +555,7 @@ static NSMapTable	*nodeNames = 0;
 
 - (GSXMLNamespace*) ns
 {
-  if (((xmlNodePtr)(lib))->ns != NULL)
+  if (lib != NULL && ((xmlNodePtr)(lib))->ns != NULL)
     {
       return [GSXMLNamespace namespaceFrom: ((xmlNodePtr)(lib))->ns];
     }
@@ -567,7 +567,7 @@ static NSMapTable	*nodeNames = 0;
 
 - (GSXMLNamespace*) nsDef
 {
-  if (((xmlNodePtr)lib)->nsDef != NULL)
+  if (lib != NULL && ((xmlNodePtr)lib)->nsDef != NULL)
     {
       return [GSXMLNamespace namespaceFrom: ((xmlNodePtr)lib)->nsDef];
     }
diff --git a/Source/NSString.m b/Source/NSString.m
index e306df1eb..19d6854b9 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -605,7 +605,13 @@ handle_printf_atsign (FILE *stream,
 
 - (id) initWithUTF8String: (const char *)bytes
 {
-  unsigned	length = strlen(bytes);
+  unsigned	length = 0;
+  if (bytes==NULL)
+    {
+      NSDebugMLog(@"bytes is NULL");
+    }
+  else
+    length=strlen(bytes);
 
   if (length > 0)
     {