From 643cf59560d0be7865bf25671c1f9b907510422e Mon Sep 17 00:00:00 2001 From: "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 git-svn-id: svn://10.0.0.236/trunk@144088 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/obsolete/nsString2.cpp | 6 ++++++ mozilla/xpcom/string/obsolete/nsString2.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp index b8df31daab4..a22e85ac54e 100644 --- a/mozilla/string/obsolete/nsString2.cpp +++ b/mozilla/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::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/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp index b8df31daab4..a22e85ac54e 100644 --- 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::length(aCString)); } NS_ConvertUTF8toUTF16::NS_ConvertUTF8toUTF16( const char* aCString, PRUint32 aLength ) { + if (!aCString) + // Leave us as an uninitialized nsAutoString. + return; Init(aCString, aLength); }