1 files changed, 19 insertions, 6 deletions
diff --git a/js/src/wasm/WasmJS.cpp b/js/src/wasm/WasmJS.cpp
index 2eb5e355d9..d987ecec29 100644
--- a/js/src/wasm/WasmJS.cpp
+++ b/js/src/wasm/WasmJS.cpp
@@ -123,6 +123,10 @@ static bool ThrowBadImportArg(JSContext* cx) {
 static bool ThrowBadImportType(JSContext* cx, const CacheableName& field,
                                const char* str) {
   UniqueChars fieldQuoted = field.toQuotedString(cx);
+  if (!fieldQuoted) {
+    ReportOutOfMemory(cx);
+    return false;
+  }
   JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
                            JSMSG_WASM_BAD_IMPORT_TYPE, fieldQuoted.get(), str);
   return false;
@@ -178,6 +182,10 @@ bool js::wasm::GetImports(JSContext* cx, const Module& module,
 
       if (!importModuleValue.isObject()) {
         UniqueChars moduleQuoted = import.module.toQuotedString(cx);
+        if (!moduleQuoted) {
+          ReportOutOfMemory(cx);
+          return false;
+        }
         JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
                                  JSMSG_WASM_BAD_IMPORT_FIELD,
                                  moduleQuoted.get());
@@ -256,6 +264,10 @@ bool js::wasm::GetImports(JSContext* cx, const Module& module,
         if (obj->resultType() != tags[index].type->resultType()) {
           UniqueChars fieldQuoted = import.field.toQuotedString(cx);
           UniqueChars moduleQuoted = import.module.toQuotedString(cx);
+          if (!fieldQuoted || !moduleQuoted) {
+            ReportOutOfMemory(cx);
+            return false;
+          }
           JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
                                    JSMSG_WASM_BAD_TAG_SIG, moduleQuoted.get(),
                                    fieldQuoted.get());
@@ -1005,8 +1017,9 @@ static bool IsModuleObject(JSObject* obj, const Module** module) {
   return true;
 }
 
-static bool GetModuleArg(JSContext* cx, CallArgs args, uint32_t numRequired,
-                         const char* name, const Module** module) {
+static bool GetModuleArg(JSContext* cx, const CallArgs& args,
+                         uint32_t numRequired, const char* name,
+                         const Module** module) {
   if (!args.requireAtLeast(cx, name, numRequired)) {
     return false;
   }
@@ -4514,8 +4527,8 @@ static bool EnsurePromiseSupport(JSContext* cx) {
   return true;
 }
 
-static bool GetBufferSource(JSContext* cx, CallArgs callArgs, const char* name,
-                            MutableBytes* bytecode) {
+static bool GetBufferSource(JSContext* cx, const CallArgs& callArgs,
+                            const char* name, MutableBytes* bytecode) {
   if (!callArgs.requireAtLeast(cx, name, 1)) {
     return false;
   }
@@ -4576,7 +4589,7 @@ static bool WebAssembly_compile(JSContext* cx, unsigned argc, Value* vp) {
   return true;
 }
 
-static bool GetInstantiateArgs(JSContext* cx, CallArgs callArgs,
+static bool GetInstantiateArgs(JSContext* cx, const CallArgs& callArgs,
                                MutableHandleObject firstArg,
                                MutableHandleObject importObj,
                                MutableHandleValue featureOptions) {
@@ -5089,7 +5102,7 @@ const JSClass ResolveResponseClosure::class_ = {
     &ResolveResponseClosure::classOps_,
 };
 
-static ResolveResponseClosure* ToResolveResponseClosure(CallArgs args) {
+static ResolveResponseClosure* ToResolveResponseClosure(const CallArgs& args) {
   return &args.callee()
               .as<JSFunction>()
               .getExtendedSlot(0)