Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 230104 : fall back to ISO-8859-1 in the script loader when charset name is not recognized or no Unicode decoder is available (r=smontagu, sr=bz)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@151208 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jshin%mailaps.org
2004-01-12 20:41:58 +00:00
parent db70280c3b
commit 0e4760c894
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/content/base/src/nsScriptLoader.cpp
View File

@@ -812,6 +812,11 @@ nsScriptLoader::OnStreamComplete(nsIStreamLoader* aLoader,
if (NS_SUCCEEDED(rv) && charsetConv) {
rv = charsetConv->GetUnicodeDecoder(characterSet.get(),
getter_AddRefs(unicodeDecoder));
if (NS_FAILED(rv)) {
// fall back to ISO-8859-1 if charset is not supported. (bug 230104)
rv = charsetConv->GetUnicodeDecoderRaw("ISO-8859-1",
getter_AddRefs(unicodeDecoder));
}
}
// converts from the charset to unicode