Bug 1665862: Don't use AutoSafeJSContext in XMLHttpRequestWorker. r=nika

It crashes if it fails to create the unprivileged junk scope, which is not great when it's being used by a fallible function. Differential Revision: https://phabricator.services.mozilla.com/D90753
Brli · Sep 19, 2020 · fb03af0 · fb03af0
1 parent e1b767e
commit fb03af0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/dom/xhr/XMLHttpRequestWorker.cpp b/dom/xhr/XMLHttpRequestWorker.cpp
@@ -898,7 +898,12 @@ Proxy::HandleEvent(Event* aEvent) {
   }
 
   {
-    AutoSafeJSContext cx;
+    AutoJSAPI jsapi;
+    JSObject* junkScope = xpc::UnprivilegedJunkScope(fallible);
+    if (!junkScope || !jsapi.Init(junkScope)) {
+      return NS_ERROR_FAILURE;
+    }
+    JSContext* cx = jsapi.cx();
 
     JS::Rooted<JS::Value> value(cx);
     if (!GetOrCreateDOMReflectorNoWrap(cx, mXHR, &value)) {