Move CALLF immediate argument validation to validate_instructions()

ethereum · Jun 6, 2023 · 93cc5fb · 93cc5fb
1 parent 6e2a589
commit 93cc5fb
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/evmone/eof.cpp b/lib/evmone/eof.cpp
@@ -222,6 +222,13 @@ EOFValidationError validate_instructions(
                 return EOFValidationError::invalid_rjumpv_count;
             i += static_cast<size_t>(1 /* count */ + count * 2 /* tbl */);
         }
+        else if (op == OP_CALLF)
+        {
+            const auto fid = read_uint16_be(&code[i + 1]);
+            if (fid >= header.types.size())
+                return EOFValidationError::invalid_code_section_index;
+            i += 2;
+        }
         else if (op == OP_DATALOADN)
         {
             const auto index = read_uint16_be(&code[i + 1]);
@@ -329,9 +336,6 @@ std::variant<EOFValidationError, int32_t> validate_max_stack_height(
         {
             const auto fid = read_uint16_be(&code[i + 1]);
 
-            if (fid >= code_types.size())
-                return EOFValidationError::invalid_code_section_index;
-
             stack_height_required = static_cast<int8_t>(code_types[fid].inputs);
             stack_height_change =
                 static_cast<int8_t>(code_types[fid].outputs - stack_height_required);