From 971f61a6dc99b619ec54f20d0ec8e5bf27ab9c37 Mon Sep 17 00:00:00 2001
From: "robin.lu%sun.com" <robin.lu%sun.com>
Date: Sat, 30 Apr 2005 06:11:35 +0000
Subject: [PATCH] fix bug Bug 266259 memory leak in
 nsCharsetConverterManager::GetCharsetLangGroupRaw() patched by Boying Lu
 <brian.lu@sun.com> r=smontagu sr=neil.parkwaycc.co.uk

---
 intl/uconv/src/nsCharsetConverterManager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp
index 98c8d3222cde..2c18301de9b1 100644
--- a/intl/uconv/src/nsCharsetConverterManager.cpp
+++ b/intl/uconv/src/nsCharsetConverterManager.cpp
@@ -444,6 +444,7 @@ nsCharsetConverterManager::GetCharsetLangGroupRaw(const char * aCharset,
                                                   nsIAtom** aResult)
 {
 
+  *aResult = nsnull;
   if (aCharset == NULL)
     return NS_ERROR_NULL_POINTER;
 
@@ -458,6 +459,8 @@ nsCharsetConverterManager::GetCharsetLangGroupRaw(const char * aCharset,
   nsAutoString langGroup;
   rv = GetBundleValue(mDataBundle, aCharset, NS_LITERAL_STRING(".LangGroup"), langGroup);
 
-  *aResult = NS_NewAtom(langGroup);
+  if (NS_SUCCEEDED(rv))
+    *aResult = NS_NewAtom(langGroup);
+
   return rv;
 }