Bug 1518075 - Add check for null script because compilation can 'succeed' if scripting is disabled r=smaug

2019-01-08 10:41:48 +00:00
parent 617fed4b0b
commit 8f3ee34e7a
1 changed files with 5 additions and 0 deletions
--- a/dom/script/ScriptLoader.cpp
+++ b/dom/script/ScriptLoader.cpp
@@ -2444,6 +2444,11 @@ static nsresult ExecuteCompiledScript(JSContext* aCx,
                                      ScriptLoadRequest* aRequest,
                                      nsJSUtils::ExecutionContext& aExec) {
  JS::Rooted<JSScript*> script(aCx, aExec.GetScript());
+  if (!script) {
+    // Compilation succeeds without producing a script if scripting is
+    // disabled for the global.
+    return NS_OK;
+  }

  // Create a ClassicScript object and associate it with the JSScript.
  RefPtr<ClassicScript> classicScript =