From 28821219dd0cf5f5f2e1e01c450e94392462aa76 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 4 May 2022 22:00:02 +0000 Subject: [PATCH] Bug 1761981 --- dom/jsurl/nsJSProtocolHandler.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dom/jsurl/nsJSProtocolHandler.cpp b/dom/jsurl/nsJSProtocolHandler.cpp index 7602e58b0b..5db4d69e0d 100644 --- a/dom/jsurl/nsJSProtocolHandler.cpp +++ b/dom/jsurl/nsJSProtocolHandler.cpp @@ -202,7 +202,12 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel, // Sandboxed document check: javascript: URI's are disabled // in a sandboxed document unless 'allow-scripts' was specified. nsIDocument* doc = aOriginalInnerWindow->GetExtantDoc(); + if (doc && !doc->IsScriptEnabled()) { + // Scripts not allowed on the extant doc. + return NS_ERROR_DOM_RETVAL_UNDEFINED; + } if (doc && doc->HasScriptsBlockedBySandbox()) { + // Sandbox policy forbids scripting. return NS_ERROR_DOM_RETVAL_UNDEFINED; }