check initcode size earlier (hyperledger#7233)

Fail earlier with the initcode size check Signed-off-by: Danno Ferrin <danno@numisight.com>
fab-10 · Jun 16, 2024 · db9710b · db9710b
1 parent 529bd33
commit db9710b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCreateOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCreateOperation.java
@@ -104,6 +104,11 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
 
     Code code = codeSupplier.get();
 
+    if (code != null && code.getSize() > maxInitcodeSize) {
+      frame.popStackItems(getStackItemsConsumed());
+      return new OperationResult(cost, ExceptionalHaltReason.CODE_TOO_LARGE);
+    }
+
     if (value.compareTo(account.getBalance()) > 0
         || frame.getDepth() >= 1024
         || account.getNonce() == -1
@@ -113,14 +118,9 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
     } else {
       account.incrementNonce();
 
-      if (code.getSize() > maxInitcodeSize) {
-        frame.popStackItems(getStackItemsConsumed());
-        return new OperationResult(cost, ExceptionalHaltReason.CODE_TOO_LARGE);
-      }
       if (!code.isValid()) {
         fail(frame);
       } else {
-
         frame.decrementRemainingGas(cost);
         spawnChildMessage(frame, code, evm);
         frame.incrementRemainingGas(cost);