Make sure we have a JSObject before trying to get global.

2020-07-16 03:30:59 +03:00 · 2020-07-16 03:30:59 +03:00 · 7dd71e41e4
parent 1fb3124661
commit 7dd71e41e4
1 changed files with 7 additions and 1 deletions
--- a/dom/base/ScriptSettings.cpp
+++ b/dom/base/ScriptSettings.cpp
@ -485,7 +485,13 @@ AutoJSAPI::Init(nsIGlobalObject* aGlobalObject)
 bool
 AutoJSAPI::Init(JSObject* aObject)
 {
-  return Init(xpc::NativeGlobal(aObject));
+  nsIGlobalObject* global = nullptr;
+  if (aObject)
+    global = xpc::NativeGlobal(aObject);
+  if (global)
+    return Init(global);
+  else
+    return false;
 }

 bool