Bug 415491, part 4 - Make UnEscapeURIForUI always escape the result if it contains blacklisted characters. r=bzbarsky

This commit is contained in:
Mats Palmgren 2014-11-08 02:42:05 +00:00
parent 42a64f6c96
commit da6a98dfa9

View File

@ -243,7 +243,8 @@ NS_IMETHODIMP nsTextToSubURI::UnEscapeURIForUI(const nsACString & aCharset,
!= NS_OK) {
// assume UTF-8 instead of ASCII because hostname (IDN) may be in UTF-8
CopyUTF8toUTF16(aURIFragment, _retval);
} else {
}
// if there are any characters that are unsafe for IRIs, reescape.
if (mUnsafeChars.IsVoid()) {
nsCOMPtr<nsISupportsString> blacklist;
@ -268,7 +269,6 @@ NS_IMETHODIMP nsTextToSubURI::UnEscapeURIForUI(const nsACString & aCharset,
nsString reescapedSpec;
_retval = NS_EscapeURL(_retval, esc_OnlyNonASCII, reescapedSpec);
}
}
return NS_OK;
}