From b924c152c58da386eac97f6c47cfac220660e883 Mon Sep 17 00:00:00 2001 From: dcodeIO Date: Thu, 8 Nov 2018 08:23:00 +0100 Subject: [PATCH] Fix fallback to imported memory in loader, fixes #322 --- lib/loader/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/loader/index.js b/lib/loader/index.js index 1eb22281..31edb71f 100644 --- a/lib/loader/index.js +++ b/lib/loader/index.js @@ -26,7 +26,7 @@ function preInstantiate(imports) { // add the internal abort function that is called when an assertion fails or an error is thrown if (!imports.env) imports.env = {}; if (!imports.env.abort) imports.env.abort = function abort(mesg, file, line, colm) { - var memory = baseModule.memory || this.memory; // prefer exported, otherwise try imported + var memory = baseModule.memory || imports.env.memory; // prefer exported, otherwise try imported function getString(memory, ptr) { if (!memory) return ""; var buffer = memory.buffer;