diff options
Diffstat (limited to 'vm/vm.go')
| -rw-r--r-- | vm/vm.go | 37 |
1 files changed, 18 insertions, 19 deletions
@@ -441,24 +441,18 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) { self.Printf(" => %d", l) case CALLDATACOPY: var ( - size = uint64(len(callData)) - mOff = stack.pop().Uint64() - cOff = stack.pop().Uint64() - l = stack.pop().Uint64() + mOff = stack.pop() + cOff = stack.pop() + l = stack.pop() ) - - if cOff > size { - cOff = 0 - l = 0 - } else if cOff+l > size { - l = 0 + var data []byte + if cOff.Cmp(big.NewInt(int64(len(callData)))) <= 0 { + data = getData(callData, cOff.Uint64(), l.Uint64()) } - code := callData[cOff : cOff+l] - - mem.Set(mOff, l, code) + mem.Set(mOff.Uint64(), l.Uint64(), data) - self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, callData[cOff:cOff+l]) + self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, data) case CODESIZE, EXTCODESIZE: var code []byte if op == EXTCODESIZE { @@ -481,14 +475,19 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) { } else { code = context.Code } + var ( - mOff = stack.pop().Uint64() - cOff = stack.pop().Uint64() - l = stack.pop().Uint64() + mOff = stack.pop() + cOff = stack.pop() + l = stack.pop() ) - codeCopy := getCode(code, cOff, l) - mem.Set(mOff, l, codeCopy) + var codeCopy []byte + if cOff.Cmp(big.NewInt(int64(len(code)))) <= 0 { + codeCopy = getData(code, cOff.Uint64(), l.Uint64()) + } + + mem.Set(mOff.Uint64(), l.Uint64(), codeCopy) self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, codeCopy) case GASPRICE: |