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

Bug 1908759 - Don't use UTS 46 ToUnicode from nsDocShell::AttemptURIFixup. r=necko-reviewers,jesup,valentin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D217009
This commit is contained in:
Henri Sivonen
2024-08-14 18:30:08 +00:00
parent 6de60b0677
commit 52ee691148
5 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
docshell/base/nsDocShell.cpp
View File

@@ -5992,29 +5992,16 @@ already_AddRefed<nsIURI> nsDocShell::AttemptURIFixup(
//
// If this string was passed through nsStandardURL by
// chance, then it may have been converted from UTF-8 to
// ACE, which would result in a completely bogus keyword
// Punycode, which would result in a completely bogus keyword
// query. Here we try to recover the original Unicode
// value, but this is not 100% correct since the value may
// have been normalized per the IDN normalization rules.
//
// Since we don't have access to the exact original string
// that was entered by the user, this will just have to do.
//
// XXX: Since we are not trying to use the result as an
// actual domain name, label-wise Punycode decode would
// likely be more appropriate than the full ToUnicode
// operation.
bool isACE;
nsAutoCString utf8Host;
nsCOMPtr<nsIIDNService> idnSrv =
do_GetService(NS_IDNSERVICE_CONTRACTID);
if (idnSrv && NS_SUCCEEDED(idnSrv->IsACE(host, &isACE)) && isACE &&
NS_SUCCEEDED(idnSrv->ConvertACEtoUTF8(host, utf8Host))) {
info = KeywordToURI(utf8Host, aUsePrivateBrowsing);
} else {
info = KeywordToURI(host, aUsePrivateBrowsing);
}
mozilla_net_recover_keyword_from_punycode(&host, &utf8Host);
info = KeywordToURI(utf8Host, aUsePrivateBrowsing);
}
if (info) {
info->GetPreferredURI(getter_AddRefs(newURI));