Keep the pointer version of NS_ConvertUTF8toUTF16 null-safe. b=210279 r+sr=jag

git-svn-id: svn://10.0.0.236/trunk@144088 18797224-902f-48f8-a5cc-f745e15eee43
2003-06-24 05:42:05 +00:00
parent 3bdd5c558b
commit 643cf59560
2 changed files with 12 additions and 0 deletions
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/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);
  }