From fe8e92e1a8bb3079a9f13e007022536836bd6b58 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Fri, 17 Jun 2016 16:22:36 +0100 Subject: fix interpreter on indirect calls, do arguments before checking and doing the call (they might flow) --- src/wasm-interpreter.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/wasm-interpreter.h') diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h index 9024031d2..66aa2e625 100644 --- a/src/wasm-interpreter.h +++ b/src/wasm-interpreter.h @@ -351,14 +351,14 @@ private: NOTE_ENTER("CallIndirect"); Flow target = visit(curr->target); if (target.breaking()) return target; + LiteralList arguments; + Flow flow = generateArguments(curr->operands, arguments); + if (flow.breaking()) return flow; size_t index = target.value.geti32(); if (index >= instance.wasm.table.names.size()) trap("callIndirect: overflow"); Name name = instance.wasm.table.names[index]; Function *func = instance.wasm.getFunction(name); if (func->type.is() && func->type != curr->fullType) trap("callIndirect: bad type"); - LiteralList arguments; - Flow flow = generateArguments(curr->operands, arguments); - if (flow.breaking()) return flow; if (func->params.size() != arguments.size()) trap("callIndirect: bad # of arguments"); for (size_t i = 0; i < func->getNumLocals(); i++) { if (func->params[i] != arguments[i].type) trap("callIndirect: bad argument type"); -- cgit v1.2.3