fix for stack overflow tests

ethereumjs · Jun 8, 2017 · 9edd6eb · 9edd6eb
1 parent b83a928
commit 9edd6eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/constants.js b/lib/constants.js
@@ -1,6 +1,7 @@
 exports.ERROR = {
   OUT_OF_GAS: 'out of gas',
   STACK_UNDERFLOW: 'stack underflow',
+  STACK_OVERFLOW: 'stack overflow',
   INVALID_JUMP: 'invalid JUMP',
   INVALID_OPCODE: 'invalid opcode'
 }
diff --git a/lib/runCode.js b/lib/runCode.js
@@ -109,9 +109,6 @@ module.exports = function (opts, cb) {
   }
 
   function iterateVm (done) {
-    if (runState.stack.length > 1024) {
-      return done(ERROR.INVALID_OPCODE)
-    }
 
     var opCode = runState.code[runState.programCounter]
     var opInfo = lookupOpInfo(opCode)
@@ -131,6 +128,10 @@ module.exports = function (opts, cb) {
       return done(ERROR.STACK_UNDERFLOW)
     }
 
+    if ((runState.stack.length - opInfo.in + opInfo.out) > 1024) {
+      return done(ERROR.STACK_OVERFLOW)
+    }
+
     async.series([
       runStepHook,
       runOp