From 59e9d2ff681bad13c90a7c2b73f86a9f6ee47d53 Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org" <dbaron%dbaron.org>
Date: Tue, 24 Jun 2003 05:42:05 +0000
Subject: [PATCH] Keep the pointer version of NS_ConvertUTF8toUTF16 null-safe. 
 b=210279  r+sr=jag

---
 string/obsolete/nsString2.cpp       | 6 ++++++
 xpcom/string/obsolete/nsString2.cpp | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/string/obsolete/nsString2.cpp b/string/obsolete/nsString2.cpp
index b8df31daab4..a22e85ac54e 100644
--- a/string/obsolete/nsString2.cpp
+++ b/string/obsolete/nsString2.cpp
@@ -1390,11 +1390,17 @@ NS_ConvertUTF8toUTF16::NS_ConvertUTF8toUTF16( const nsASingleFragmentCString& aC
 
 NS_ConvertUTF8toUTF16::NS_ConvertUTF8toUTF16( const char* aCString )
   {
+    if (!aCString)
+      // Leave us as an uninitialized nsAutoString.
+      return;
     Init(aCString, nsCharTraits<char>::length(aCString));
   }
 
 NS_ConvertUTF8toUTF16::NS_ConvertUTF8toUTF16( const char* aCString, PRUint32 aLength )
   {
+    if (!aCString)
+      // Leave us as an uninitialized nsAutoString.
+      return;
     Init(aCString, aLength);
   }
 
diff --git a/xpcom/string/obsolete/nsString2.cpp b/xpcom/string/obsolete/nsString2.cpp
index b8df31daab4..a22e85ac54e 100644
--- a/xpcom/string/obsolete/nsString2.cpp
+++ b/xpcom/string/obsolete/nsString2.cpp
@@ -1390,11 +1390,17 @@ NS_ConvertUTF8toUTF16::NS_ConvertUTF8toUTF16( const nsASingleFragmentCString& aC
 
 NS_ConvertUTF8toUTF16::NS_ConvertUTF8toUTF16( const char* aCString )
   {
+    if (!aCString)
+      // Leave us as an uninitialized nsAutoString.
+      return;
     Init(aCString, nsCharTraits<char>::length(aCString));
   }
 
 NS_ConvertUTF8toUTF16::NS_ConvertUTF8toUTF16( const char* aCString, PRUint32 aLength )
   {
+    if (!aCString)
+      // Leave us as an uninitialized nsAutoString.
+      return;
     Init(aCString, aLength);
   }