From 2f5501df93e32682c3373e9211ee43c192617331 Mon Sep 17 00:00:00 2001
From: "nhotta%netscape.com"
 <nhotta%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 12 Oct 2000 22:42:19 +0000
Subject: [PATCH] Added an error handling in ConvertToUnicode() to use
 ISO-8859-1 if charset is invalid, bug 56059, r=bienvenu, sr=alecf,mscott.

git-svn-id: svn://10.0.0.236/trunk@81063 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/util/nsMsgI18N.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mozilla/mailnews/base/util/nsMsgI18N.cpp b/mozilla/mailnews/base/util/nsMsgI18N.cpp
index 352f130c7f4..d7ea1afbeea 100644
--- a/mozilla/mailnews/base/util/nsMsgI18N.cpp
+++ b/mozilla/mailnews/base/util/nsMsgI18N.cpp
@@ -319,7 +319,9 @@ nsresult ConvertToUnicode(const nsString& aCharset,
     }
   }
   if (NS_FAILED(res)) {
-    return res;
+    // ignore charset alias error and use fallback charset.
+    convCharset = NS_LITERAL_STRING("ISO-8859-1").get();
+    res = NS_OK;
   }
 
   NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res);