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

Merge pull request #379 from nspcc-dev/fix/left-with-big-index

Browse source 
vm: do not fault on LEFT with big index
This commit is contained in:
Roman Khimov 2019-09-09 17:39:59 +03:00 committed by GitHub
commit 0055701ec0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/vm/vm.go
View file

@ -315,6 +315,9 @@ func (v *VM) execute(ctx *Context, op Instruction) {
case LEFT: case LEFT:
l := int(v.estack.Pop().BigInt().Int64()) l := int(v.estack.Pop().BigInt().Int64())
s := v.estack.Pop().Bytes() s := v.estack.Pop().Bytes()
if t := len(s); l > t {
l = t
}
v.estack.PushVal(s[:l]) v.estack.PushVal(s[:l])
case RIGHT: case RIGHT:
l := int(v.estack.Pop().BigInt().Int64()) l := int(v.estack.Pop().BigInt().Int64())

6
pkg/vm/vm_test.go
View file

@ -685,13 +685,15 @@ func TestLEFTGood(t *testing.T) {
assert.Equal(t, []byte("ab"), vm.estack.Peek(0).Bytes()) assert.Equal(t, []byte("ab"), vm.estack.Peek(0).Bytes())
} }
func TestLEFTBadLen(t *testing.T) { func TestLEFTGoodLen(t *testing.T) {
prog := makeProgram(LEFT) prog := makeProgram(LEFT)
vm := load(prog) vm := load(prog)
vm.estack.PushVal([]byte("abcdef")) vm.estack.PushVal([]byte("abcdef"))
vm.estack.PushVal(8) vm.estack.PushVal(8)
vm.Run() vm.Run()
assert.Equal(t, true, vm.state.HasFlag(faultState)) assert.Equal(t, false, vm.state.HasFlag(faultState))
assert.Equal(t, 1, vm.estack.Len())
assert.Equal(t, []byte("abcdef"), vm.estack.Peek(0).Bytes())
} }
func TestRIGHTBadNoArgs(t *testing.T) { func TestRIGHTBadNoArgs(t *testing.T) {