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

vm: restrict max size in APPEND

Browse source
This commit is contained in:
Evgenii Stratonikov 2019-10-17 11:03:35 +03:00
parent 8abcaeee6f
commit 2d56c66bde
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/vm/vm.go
View file

@ -786,10 +786,16 @@ func (v *VM) execute(ctx *Context, op Instruction, parameter []byte) {
switch t := arrElem.value.(type) { switch t := arrElem.value.(type) {
case *ArrayItem: case *ArrayItem:
arr := t.Value().([]StackItem) arr := t.Value().([]StackItem)
if len(arr) >= MaxArraySize {
panic("too long array")
}
arr = append(arr, val) arr = append(arr, val)
t.value = arr t.value = arr
case *StructItem: case *StructItem:
arr := t.Value().([]StackItem) arr := t.Value().([]StackItem)
if len(arr) >= MaxArraySize {
panic("too long struct")
}
arr = append(arr, val) arr = append(arr, val)
t.value = arr t.value = arr
default: default:

18
pkg/vm/vm_test.go
View file

@ -652,6 +652,24 @@ func TestAPPENDWrongType(t *testing.T) {
assert.Equal(t, true, vm.HasFailed()) assert.Equal(t, true, vm.HasFailed())
} }
func TestAPPENDGoodSizeLimit(t *testing.T) {
prog := makeProgram(NEWARRAY, DUP, PUSH0, APPEND)
vm := load(prog)
vm.estack.PushVal(MaxArraySize - 1)
vm.Run()
assert.Equal(t, false, vm.state.HasFlag(faultState))
assert.Equal(t, 1, vm.estack.Len())
assert.Equal(t, MaxArraySize, len(vm.estack.Pop().Array()))
}
func TestAPPENDBadSizeLimit(t *testing.T) {
prog := makeProgram(NEWARRAY, DUP, PUSH0, APPEND)
vm := load(prog)
vm.estack.PushVal(MaxArraySize)
vm.Run()
assert.Equal(t, true, vm.state.HasFlag(faultState))
}
func TestPICKITEMBadIndex(t *testing.T) { func TestPICKITEMBadIndex(t *testing.T) {
prog := makeProgram(PICKITEM) prog := makeProgram(PICKITEM)
vm := load(prog) vm := load(prog)