From d0a1bf03fbab1d04b3d10382a95a2da0180e2b83 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Wed, 7 Feb 2018 14:39:35 +0100
Subject: [PATCH] WASM: Set OOM failure flag on alloc failure when context is
 available.

---
 js/src/wasm/WasmModule.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/src/wasm/WasmModule.cpp b/js/src/wasm/WasmModule.cpp
index be7ddba8f6..b24e01a400 100644
--- a/js/src/wasm/WasmModule.cpp
+++ b/js/src/wasm/WasmModule.cpp
@@ -1007,12 +1007,16 @@ Module::instantiate(JSContext* cx,
         maybeBytecode = bytecode_.get();
 
     auto codeSegment = CodeSegment::create(cx, code_, linkData_, *metadata_, memory);
-    if (!codeSegment)
+    if (!codeSegment) {
+        ReportOutOfMemory(cx);
         return false;
+    }
 
     auto code = cx->make_unique<Code>(Move(codeSegment), *metadata_, maybeBytecode);
-    if (!code)
+    if (!code) {
+        ReportOutOfMemory(cx);
         return false;
+    }
 
     instance.set(WasmInstanceObject::create(cx,
                                             Move(code),