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

Bug 1372994 addendum - Sanitize encoding names from old cache entries. r=emk

Browse Source 
MozReview-Commit-ID: GcMlVEfaPnD
This commit is contained in:
Henri Sivonen
2017-06-15 10:52:31 +03:00
parent 1804c94f3b
commit b778e5e72e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dom/html/nsHTMLDocument.cpp
View File

@@ -357,12 +357,19 @@ nsHTMLDocument::TryCacheCharset(nsICachingChannel* aCachingChannel,
nsCString cachedCharset;
rv = aCachingChannel->GetCacheTokenCachedCharset(cachedCharset);
if (NS_FAILED(rv) || cachedCharset.IsEmpty()) {
return;
}
// The canonical names changed, so the cache may have an old name.
if (!cachedCharset.EqualsLiteral("replacement")) {
if (!EncodingUtils::FindEncodingForLabel(cachedCharset, cachedCharset)) {
return;
}
}
// Check EncodingUtils::IsAsciiCompatible() even in the cache case, because the value
// might be stale and in the case of a stale charset that is not a rough
// ASCII superset, the parser has no way to recover.
if (NS_SUCCEEDED(rv) &&
!cachedCharset.IsEmpty() &&
EncodingUtils::IsAsciiCompatible(cachedCharset))
if (EncodingUtils::IsAsciiCompatible(cachedCharset))
{
aCharset = cachedCharset;
aCharsetSource = kCharsetFromCache;