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
This commit is contained in:
parent
f975de779d
commit
2f5501df93
@ -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);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user