roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Make sure that CALL addr is always 20 bytes

Browse Source
This commit is contained in:
obscuren 2015-02-02 20:01:10 -08:00
parent 93ae7bb0d2
commit faa54e59c1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vm/vm.go
View File

@ -516,7 +516,7 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
case BLOCKHASH:
num := stack.Pop()
n := U256(new(big.Int).Sub(self.env.BlockNumber(), ethutil.Big257))
n := new(big.Int).Sub(self.env.BlockNumber(), ethutil.Big257)
if num.Cmp(n) > 0 && num.Cmp(self.env.BlockNumber()) < 0 {
stack.Push(ethutil.BigD(self.env.GetHash(num.Uint64())))
} else {
@ -681,8 +681,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
self.Dbg.SetCode(context.Code)
}
case CALL, CALLCODE:
self.Endl()
gas := stack.Pop()
// Pop gas and value of the stack.
value, addr := stack.Popn()
@ -691,6 +689,9 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
// Pop return size and offset
retSize, retOffset := stack.Popn()
address := ethutil.Address(addr.Bytes())
self.Printf(" => %x", address).Endl()
// Get the arguments from the memory
args := mem.Get(inOffset.Int64(), inSize.Int64())
@ -699,9 +700,9 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
err error
)
if op == CALLCODE {
ret, err = self.env.CallCode(context, addr.Bytes(), args, gas, price, value)
ret, err = self.env.CallCode(context, address, args, gas, price, value)
} else {
ret, err = self.env.Call(context, addr.Bytes(), args, gas, price, value)
ret, err = self.env.Call(context, address, args, gas, price, value)
}
if err != nil {