Fix export object retrieval in WebAssembly.instantiate()

Qwokka · Apr 26, 2022 · cd7e42f · cd7e42f
1 parent 2a4722f
commit cd7e42f
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/content/init.js b/content/init.js
@@ -825,20 +825,26 @@ const webAssemblyInstantiateHook = function(inObject, importObject = {}) {
 
     return new Promise(function(resolve, reject) {
         oldWebAssemblyInstantiate(instrumentedObject, importObject).then(function(instanceObject) {
+            let instance = instanceObject;
+
+            if (typeof instanceObject.instance !== "undefined") {
+                instance = instanceObject.instance;
+            }
+
             if (typeof memoryDescriptor !== "undefined" && memoryDescriptor.type === "export") {
-                memoryInstance = getMemoryFromObject(instanceObject.exports, memoryDescriptor);
+                let exportObject = instance.exports;
+
+                if (typeof exportObject !== "object") {
+                    colorError("WebAssembly.instantiate() failed to retrieve export object for instantiated module");
+                }
+
+                memoryInstance = getMemoryFromObject(exportObject, memoryDescriptor);
             }
 
             if (!(memoryInstance instanceof WebAssembly.Memory)) {
                 colorError("WebAssembly.instantiate() failed to retrieve a WebAssembly.Memory object");
             }
 
-            let instance = instanceObject;
-
-            if (typeof instanceObject.instance !== "undefined") {
-                instance = instanceObject.instance;
-            }
-
             cetus = new Cetus({
                 memory: memoryInstance,
                 watchpointExports: [instance.exports.addWatch],