corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1373045 - Avoid double-resolving the replacement encoding. r=emk

Browse Source 
MozReview-Commit-ID: F0nOJ2opz0r
This commit is contained in:
Henri Sivonen
2017-06-15 11:05:05 +03:00
parent 0d6285ee62
commit d470017fe2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
parser/htmlparser/nsScanner.cpp
View File

@@ -107,9 +107,13 @@ nsresult nsScanner::SetDocumentCharset(const nsACString& aCharset , int32_t aSou
mCharsetSource = aSource;
nsCString charsetName;
mozilla::DebugOnly<bool> valid =
EncodingUtils::FindEncodingForLabel(aCharset, charsetName);
MOZ_ASSERT(valid, "Should never call with a bogus aCharset.");
if (aCharset.EqualsLiteral("replacement")) {
charsetName.Assign(aCharset);
} else {
mozilla::DebugOnly<bool> valid =
EncodingUtils::FindEncodingForLabel(aCharset, charsetName);
MOZ_ASSERT(valid, "Should never call with a bogus aCharset.");
}
if (!mCharset.IsEmpty() && charsetName.Equals(mCharset)) {
return NS_OK; // no difference, don't change it