moves check for init code length before balance check (hyperledger#5077)

Signed-off-by: Justin Florentine <[email protected]>
elenduuche · Aug 16, 2023 · beeabf6 · beeabf6
1 parent 4aed2d9
commit beeabf6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ethereum/referencetests/src/reference-test/external-resources b/ethereum/referencetests/src/reference-test/external-resources
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
@@ -80,6 +80,12 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
     final MutableAccount account = frame.getWorldUpdater().getAccount(address).getMutable();
 
     frame.clearReturnData();
+    final long inputOffset = clampedToLong(frame.getStackItem(1));
+    final long inputSize = clampedToLong(frame.getStackItem(2));
+    if (inputSize > maxInitcodeSize) {
+      frame.popStackItems(getStackItemsConsumed());
+      return new OperationResult(cost, ExceptionalHaltReason.CODE_TOO_LARGE);
+    }
 
     if (value.compareTo(account.getBalance()) > 0
         || frame.getMessageStackDepth() >= 1024
@@ -88,12 +94,6 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
     } else {
       account.incrementNonce();
 
-      final long inputOffset = clampedToLong(frame.getStackItem(1));
-      final long inputSize = clampedToLong(frame.getStackItem(2));
-      if (inputSize > maxInitcodeSize) {
-        frame.popStackItems(getStackItemsConsumed());
-        return new OperationResult(cost, ExceptionalHaltReason.CODE_TOO_LARGE);
-      }
       final Bytes inputData = frame.readMemory(inputOffset, inputSize);
       // Never cache CREATEx initcode. The amount of reuse is very low, and caching mostly
       // addresses disk loading delay, and we already have the code.