trap on invalid call_indirects with bad arguments when no type provided

1 files changed, 4 insertions, 0 deletions

diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index 0ee2aff78..82ead1d8f 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -359,6 +359,10 @@ private:
         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");
+        }
         return instance.callFunctionInternal(name, arguments);
       }