tor-browser

commit deccebb8a2881d9280381ac425823078e227f1c7
parent c8558d0a6d93c5d1121bf4a26675c089f0065db3
Author: Adam Vandolder <adam.vandolder@gmail.com>
Date:   Wed, 10 Dec 2025 18:19:29 +0000

Bug 2005209 - Make Document::CanRewriteURL check aReportErrors when the URI is a local file. r=farre

Differential Revision: https://phabricator.services.mozilla.com/D275789

Diffstat:
M
docshell/base/nsDocShell.cpp
 | 
2
+-
M
dom/base/Document.cpp
 | 
7
+++++--

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
@@ -12847,7 +12847,7 @@ void nsDocShell::MaybeFireTraverseHistory(nsDocShellLoadState* aLoadState) {
                                     ->mInfo.GetURIOrInheritedForAboutBlank();
   if (NS_FAILED(nsContentUtils::GetSecurityManager()->CheckSameOriginURI(
           activeURI, loadingURI,
-          /*reportError=*/true,
+          /*reportError=*/false,
           /*fromPrivateWindow=*/false))) {
     return;
   }
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
@@ -13501,8 +13501,11 @@ bool Document::CanRewriteURL(nsIURI* aTargetURL, bool aReportErrors) const {
   if (nsContentUtils::URIIsLocalFile(aTargetURL)) {
     // It's a file:// URI
     nsCOMPtr<nsIPrincipal> principal = NodePrincipal();
-    return NS_SUCCEEDED(principal->CheckMayLoadWithReporting(aTargetURL, false,
-                                                             InnerWindowID()));
+    if (aReportErrors) {
+      return NS_SUCCEEDED(principal->CheckMayLoadWithReporting(
+          aTargetURL, false, InnerWindowID()));
+    }
+    return NS_SUCCEEDED(principal->CheckMayLoad(aTargetURL, false));
   }
 
   nsCOMPtr<nsIScriptSecurityManager> secMan =