diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-24 02:25:59 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-24 02:25:59 +0800 |
| commit | 359677b6739e9df26988aacf87fb6069b61c9850 (patch) | |
| tree | 403f47b589467a7a1300d3888e20102d5dda1b64 | |
| parent | 747647e02a310e75ea1ada335ff99963972ca138 (diff) | |
| parent | dd086791acf477da7641c168f82de70ed0b2dca6 (diff) | |
| download | dexon-359677b6739e9df26988aacf87fb6069b61c9850.tar.gz dexon-359677b6739e9df26988aacf87fb6069b61c9850.tar.zst dexon-359677b6739e9df26988aacf87fb6069b61c9850.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
| -rw-r--r-- | vm/vm.go | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -779,9 +779,9 @@ func (self *Vm) calculateGasAndSize(context *Context, caller ContextRef, op OpCo // Stack Check, memory resize & gas phase switch op { // Stack checks only - case ISZERO, CALLDATALOAD, POP, JUMP, NOT: // 1 + case ISZERO, CALLDATALOAD, POP, JUMP, NOT, EXTCODESIZE, BLOCKHASH: // 1 stack.require(1) - case JUMPI, ADD, SUB, DIV, SDIV, MOD, SMOD, LT, GT, SLT, SGT, EQ, AND, OR, XOR, BYTE, SIGNEXTEND: // 2 + case JUMPI, ADD, SUB, DIV, MUL, SDIV, MOD, SMOD, LT, GT, SLT, SGT, EQ, AND, OR, XOR, BYTE, SIGNEXTEND: // 2 stack.require(2) case ADDMOD, MULMOD: // 3 stack.require(3) @@ -859,7 +859,7 @@ func (self *Vm) calculateGasAndSize(context *Context, caller ContextRef, op OpCo newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-2]) additionalGas.Set(stack.data[stack.Len()-2]) case CALLDATACOPY: - stack.require(2) + stack.require(3) newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3]) additionalGas.Set(stack.data[stack.Len()-3]) |