certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vm: fix errors not being returned

This commit is contained in:
Ethan Buchman 2015-04-02 19:14:58 -07:00
parent 3bedcbf94d
commit ade13daec1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vm/stack.go
View File

@ -32,9 +32,9 @@ func (st *Stack) useGas(gasToUse uint64) {
}
func (st *Stack) setErr(err error) {
if *st.err != nil {
*st.err = err
}
//if *st.err != nil {
*st.err = err
//}
}
func (st *Stack) Push(d Word256) {

2
vm/vm.go
View File

@ -659,7 +659,7 @@ func (vm *VM) call(caller, callee *Account, code, input []byte, value uint64, ga
case RETURN: // 0xF3
offset, size := stack.Pop64(), stack.Pop64()
ret, ok := subslice(memory, offset, size, false)
if !ok {
if !ok || err != nil {
return nil, firstErr(err, ErrMemoryOutOfBounds)
}
dbg.Printf(" => [%v, %v] (%d) 0x%X\n", offset, size, len(ret), ret)