Add stack height verification to CALLF impl

ethereum · Mar 23, 2023 · ffd9fa2 · ffd9fa2
1 parent 37cf7d7
commit ffd9fa2
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/evmone/instructions.hpp b/lib/evmone/instructions.hpp
@@ -933,13 +933,21 @@ evmc_status_code create_impl(StackTop stack, ExecutionState& state) noexcept;
 inline constexpr auto create = create_impl<OP_CREATE>;
 inline constexpr auto create2 = create_impl<OP_CREATE2>;
 
-inline code_iterator callf(StackTop /*stack*/, ExecutionState& state, code_iterator pos) noexcept
+inline code_iterator callf(StackTop stack, ExecutionState& state, code_iterator pos) noexcept
 {
     const auto index = read_uint16_be(&pos[1]);
+
     state.call_stack.push_back(pos + 3);
 
     const auto& header = state.analysis.baseline->eof_header;
 
+    const auto stack_size = &stack.top() - state.stack_space.bottom();
+    if (stack_size + header.types[index].max_stack_height > StackSpace::limit)
+    {
+        state.status = EVMC_STACK_OVERFLOW;
+        return nullptr;
+    }
+
     const auto offset = header.code_offsets[index] - header.code_offsets[0];
     auto code = state.analysis.baseline->executable_code;
     return code.data() + offset;