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

vm: restrict max item size in PUSHDATA4

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

3
pkg/vm/context.go
View file

@ -59,6 +59,9 @@ func (c *Context) Next() (Instruction, []byte, error) {
case PUSHDATA4: case PUSHDATA4:
var n uint32 var n uint32
r.ReadLE(&n) r.ReadLE(&n)
if n > MaxItemSize {
return instr, nil, errors.New("parameter is too big")
}
numtoread = int(n) numtoread = int(n)
c.nextip += 4 c.nextip += 4
case JMP, JMPIF, JMPIFNOT, CALL: case JMP, JMPIF, JMPIFNOT, CALL:

11
pkg/vm/vm_test.go
View file

@ -2,6 +2,7 @@ package vm
import ( import (
"bytes" "bytes"
"encoding/binary"
"encoding/hex" "encoding/hex"
"math/big" "math/big"
"math/rand" "math/rand"
@ -175,6 +176,16 @@ func TestPushData4ShortN(t *testing.T) {
assert.Equal(t, true, vm.HasFailed()) assert.Equal(t, true, vm.HasFailed())
} }
func TestPushData4BigN(t *testing.T) {
prog := make([]byte, 1+4+MaxItemSize+1)
prog[0] = byte(PUSHDATA4)
binary.LittleEndian.PutUint32(prog[1:], MaxItemSize+1)
vm := load(prog)
vm.Run()
assert.Equal(t, true, vm.HasFailed())
}
func TestPushData4Good(t *testing.T) { func TestPushData4Good(t *testing.T) {
prog := makeProgram(PUSHDATA4, 3, 0, 0, 0, 1, 2, 3) prog := makeProgram(PUSHDATA4, 3, 0, 0, 0, 1, 2, 3)
vm := load(prog) vm := load(prog)