From 765c90318f192ba18848095133b0531c3162678d Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Fri, 3 Jul 2020 15:59:00 +0000
Subject: Issue #618 - Fix JSAPI additions to pass the JS context.

---
 js/src/jsapi.cpp | 10 ++++++----
 js/src/jsapi.h   |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'js/src')

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 9c24f1676..cb0851f80 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -4740,16 +4740,18 @@ JS::GetModuleScript(JSContext* cx, JS::HandleObject moduleArg)
 }
 
 JS_PUBLIC_API(bool)
-JS::IsModuleErrored(JSObject* moduleArg)
+JS::IsModuleErrored(JSContext* cx, JSObject* moduleArg)
 {
-    AssertHeapIsIdle();
+    AssertHeapIsIdle(cx);
+    CHECK_REQUEST(cx);
     return moduleArg->as<ModuleObject>().status() == MODULE_STATUS_ERRORED;
 }
 
 JS_PUBLIC_API(JS::Value)
-JS::GetModuleError(JSObject* moduleArg)
+JS::GetModuleError(JSContext* cx, JSObject* moduleArg)
 {
-    AssertHeapIsIdle();
+    AssertHeapIsIdle(cx);
+    CHECK_REQUEST(cx);
     return moduleArg->as<ModuleObject>().error();
 }
 
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 9c3bf8151..6d306edc5 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -4396,10 +4396,10 @@ extern JS_PUBLIC_API(JSScript*)
 GetModuleScript(JSContext* cx, JS::HandleObject moduleRecord);
 
 extern JS_PUBLIC_API(bool)
-IsModuleErrored(JSObject* moduleRecord);
+IsModuleErrored(JSContext* cx, JSObject* moduleRecord);
 
 extern JS_PUBLIC_API(JS::Value)
-GetModuleError(JSObject* moduleRecord);
+GetModuleError(JSContext* cx, JSObject* moduleRecord);
 
 } /* namespace JS */
 
-- 
cgit v1.2.3