diff --git a/contracts/lib/ExecLib.sol b/contracts/lib/ExecLib.sol
index 1d4b4630..d5046f92 100644
--- a/contracts/lib/ExecLib.sol
+++ b/contracts/lib/ExecLib.sol
@@ -43,6 +43,9 @@ library ExecLib {
             // Extract the ERC7579 Executions
             executionBatch.offset := add(dataPointer, 32)
             executionBatch.length := calldataload(dataPointer)
+            if slt(sub(callData.length, executionBatch.length), 0) {
+                revert(0, 0)
+            }
         }
     }