TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

vm: do not pop items in OVER

Browse source
This commit is contained in:
Evgenii Stratonikov 2019-09-18 14:24:42 +03:00
parent 7cd69ea8e2
commit 4a8be486f0
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/vm/vm.go
View file

@ -408,15 +408,10 @@ func (v *VM) execute(ctx *Context, op Instruction) {
} }
case OVER: case OVER:
b := v.estack.Pop() a := v.estack.Peek(1)
if b == nil {
panic("no top-level element found")
}
a := v.estack.Peek(0)
if a == nil { if a == nil {
panic("no second element found") panic("no second element found")
} }
v.estack.Push(b)
v.estack.Push(a) v.estack.Push(a)
case PICK: case PICK:

2
pkg/vm/vm_test.go
View file

@ -920,6 +920,8 @@ func TestOVERbadNoitem(t *testing.T) {
vm.estack.PushVal(1) vm.estack.PushVal(1)
vm.Run() vm.Run()
assert.Equal(t, true, vm.state.HasFlag(faultState)) assert.Equal(t, true, vm.state.HasFlag(faultState))
assert.Equal(t, 1, vm.estack.Len())
assert.Equal(t, makeStackItem(1), vm.estack.Pop().value)
} }
func TestOVERbadNoitems(t *testing.T) { func TestOVERbadNoitems(t *testing.T) {