wavm: set context when calling __GLOBAL__ functions. (#4)

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
istio · May 21, 2019 · a63eb40 · a63eb40
1 parent 1919461
commit a63eb40
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/source/extensions/common/wasm/wavm/wavm.cc b/source/extensions/common/wasm/wavm/wavm.cc
@@ -425,7 +425,9 @@ void Wavm::start(Context* context) {
     }
 
     if (emscriptenInstance_) {
-      Emscripten::initializeGlobals(emscriptenInstance_, context_, irModule_, moduleInstance_);
+      CALL_WITH_CONTEXT(
+          Emscripten::initializeGlobals(emscriptenInstance_, context_, irModule_, moduleInstance_),
+          context);
     }
 
     f = asFunctionNullable(getInstanceExport(moduleInstance_, "__post_instantiate"));