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

vm: revert SUBSTR offset behavior to NEO 2.x

Browse source
This commit is contained in:
Evgenii Stratonikov 2019-11-06 12:15:55 +03:00
parent 4c688355bc
commit 9ebb793009
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/vm/vm.go
View file

@ -519,7 +519,10 @@ func (v *VM) execute(ctx *Context, op Instruction, parameter []byte) (err error)
} }
s := v.estack.Pop().Bytes() s := v.estack.Pop().Bytes()
if o > len(s) { if o > len(s) {
panic("invalid offset") // panic("invalid offset")
// FIXME revert when NEO 3.0 https://github.com/nspcc-dev/neo-go/issues/477
v.estack.PushVal("")
break
} }
last := l + o last := l + o
if last > len(s) { if last > len(s) {

7
pkg/vm/vm_test.go
View file

@ -1674,7 +1674,12 @@ func TestSUBSTRBadOffset(t *testing.T) {
vm.estack.PushVal([]byte("abcdef")) vm.estack.PushVal([]byte("abcdef"))
vm.estack.PushVal(7) vm.estack.PushVal(7)
vm.estack.PushVal(1) vm.estack.PushVal(1)
checkVMFailed(t, vm)
// checkVMFailed(t, vm)
// FIXME revert when NEO 3.0 https://github.com/nspcc-dev/neo-go/issues/477
runVM(t, vm)
assert.Equal(t, 1, vm.estack.Len())
assert.Equal(t, []byte{}, vm.estack.Peek(0).Bytes())
} }
func TestSUBSTRBigLen(t *testing.T) { func TestSUBSTRBigLen(t *testing.T) {