dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

Merge pull request #392 from nspcc-dev/fix/bug-append

Browse source 
VM: APPEND should push no value on stack. Fixes #391.
This commit is contained in:
Roman Khimov 2019-09-11 19:02:05 +03:00 committed by GitHub
commit 6855e4e07a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/vm/vm.go
View file

@ -633,13 +633,14 @@ func (v *VM) execute(ctx *Context, op Instruction) {
arrElem := v.estack.Pop()
switch t := arrElem.value.(type) {
case *ArrayItem, *StructItem:
case *ArrayItem:
arr := t.Value().([]StackItem)
arr = append(arr, itemElem.value)
v.estack.PushVal(arr)
case *ByteArrayItem:
newVal := append(t.value, itemElem.value.Value().([]byte)...)
v.estack.PushVal(newVal)
t.value = arr
case *StructItem:
arr := t.Value().([]StackItem)
arr = append(arr, itemElem.value)
t.value = arr
default:
panic("APPEND: not of underlying type Array")
}

44
pkg/vm/vm_test.go
View file

@ -444,6 +444,50 @@ func TestNEWSTRUCTWrongType(t *testing.T) {
assert.Equal(t, true, vm.state.HasFlag(faultState))
}
func TestAPPENDArray(t *testing.T) {
prog := makeProgram(DUP, PUSH5, APPEND)
vm := load(prog)
vm.estack.Push(&Element{value: &ArrayItem{}})
vm.Run()
assert.Equal(t, false, vm.state.HasFlag(faultState))
assert.Equal(t, 1, vm.estack.Len())
assert.Equal(t, &ArrayItem{[]StackItem{makeStackItem(5)}}, vm.estack.Pop().value)
}
func TestAPPENDStruct(t *testing.T) {
prog := makeProgram(DUP, PUSH5, APPEND)
vm := load(prog)
vm.estack.Push(&Element{value: &StructItem{}})
vm.Run()
assert.Equal(t, false, vm.state.HasFlag(faultState))
assert.Equal(t, 1, vm.estack.Len())
assert.Equal(t, &StructItem{[]StackItem{makeStackItem(5)}}, vm.estack.Pop().value)
}
func TestAPPENDBadNoArguments(t *testing.T) {
prog := makeProgram(APPEND)
vm := load(prog)
vm.Run()
assert.Equal(t, true, vm.state.HasFlag(faultState))
}
func TestAPPENDBad1Argument(t *testing.T) {
prog := makeProgram(APPEND)
vm := load(prog)
vm.estack.PushVal(1)
vm.Run()
assert.Equal(t, true, vm.state.HasFlag(faultState))
}
func TestAPPENDWrongType(t *testing.T) {
prog := makeProgram(APPEND)
vm := load(prog)
vm.estack.PushVal([]byte{})
vm.estack.PushVal(1)
vm.Run()
assert.Equal(t, true, vm.state.HasFlag(faultState))
}
func TestSIGNNoArgument(t *testing.T) {
prog := makeProgram(SIGN)
vm := load(prog)