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

vm: restrict max item size in CAT

Browse source
This commit is contained in:
Evgenii Stratonikov 2019-10-17 17:01:03 +03:00
parent 67219b9439
commit cae431b844
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/vm/vm.go
View file

@ -28,8 +28,12 @@ var (
const ( const (
// MaxArraySize is the maximum array size allowed in the VM. // MaxArraySize is the maximum array size allowed in the VM.
MaxArraySize = 1024 MaxArraySize = 1024
maxSHLArg = 256
minSHLArg = -256 // MaxItemSize is the maximum item size allowed in the VM.
MaxItemSize = 1024 * 1024
maxSHLArg = 256
minSHLArg = -256
) )
// VM represents the virtual machine. // VM represents the virtual machine.
@ -439,6 +443,9 @@ func (v *VM) execute(ctx *Context, op Instruction, parameter []byte) {
case CAT: case CAT:
b := v.estack.Pop().Bytes() b := v.estack.Pop().Bytes()
a := v.estack.Pop().Bytes() a := v.estack.Pop().Bytes()
if l := len(a) + len(b); l > MaxItemSize {
panic(fmt.Sprintf("too big item: %d", l))
}
ab := append(a, b...) ab := append(a, b...)
v.estack.PushVal(ab) v.estack.PushVal(ab)
case SUBSTR: case SUBSTR:

9
pkg/vm/vm_test.go
View file

@ -1413,6 +1413,15 @@ func TestCATBadOneArg(t *testing.T) {
assert.Equal(t, true, vm.HasFailed()) assert.Equal(t, true, vm.HasFailed())
} }
func TestCATBadBigItem(t *testing.T) {
prog := makeProgram(CAT)
vm := load(prog)
vm.estack.PushVal(make([]byte, MaxItemSize/2+1))
vm.estack.PushVal(make([]byte, MaxItemSize/2+1))
vm.Run()
assert.Equal(t, true, vm.HasFailed())
}
func TestCATGood(t *testing.T) { func TestCATGood(t *testing.T) {
prog := makeProgram(CAT) prog := makeProgram(CAT)
vm := load(prog) vm := load(prog)