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

Merge pull request #2502 from nspcc-dev/fix-initsslot-refs

Browse source 
Fix INITSSLOT refs
This commit is contained in:
Roman Khimov 2022-05-17 16:53:50 +03:00 committed by GitHub
commit 1e22024808
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/vm/slot.go
View file

@ -23,13 +23,8 @@ func (s slot) Set(i int, item stackitem.Item, refs *refCounter) {
if s[i] == item {
return
}
old := s[i]
refs.Remove(s[i])
s[i] = item
if old != nil {
refs.Remove(old)
} else {
*refs-- // Not really existing, but counted Null element.
}
refs.Add(item)
}

2
pkg/vm/vm.go
View file

@ -1588,7 +1588,7 @@ func (v *VM) unloadContext(ctx *Context) {
ctx.arguments.ClearRefs(&v.refs)
}
currCtx := v.Context()
if ctx.static != nil && currCtx != nil && ctx.static != currCtx.static {
if ctx.static != nil && (currCtx == nil || ctx.static != currCtx.static) {
ctx.static.ClearRefs(&v.refs)
}
}

29
pkg/vm/vm_test.go
View file

@ -2718,6 +2718,35 @@ func TestNestedStructEquals(t *testing.T) {
checkVMFailed(t, vm)
}
func TestRemoveReferrer(t *testing.T) {
h := "560110c34a10c36058cf4540" // #2501
prog, err := hex.DecodeString(h)
require.NoError(t, err)
vm := load(prog)
require.NoError(t, vm.StepInto()) // INITSSLOT
assert.Equal(t, 1, int(vm.refs))
require.NoError(t, vm.StepInto()) // PUSH0
assert.Equal(t, 2, int(vm.refs))
require.NoError(t, vm.StepInto()) // NEWARRAY
assert.Equal(t, 2, int(vm.refs))
require.NoError(t, vm.StepInto()) // DUP
assert.Equal(t, 3, int(vm.refs))
require.NoError(t, vm.StepInto()) // PUSH0
assert.Equal(t, 4, int(vm.refs))
require.NoError(t, vm.StepInto()) // NEWARRAY
assert.Equal(t, 4, int(vm.refs))
require.NoError(t, vm.StepInto()) // STSFLD0
assert.Equal(t, 3, int(vm.refs))
require.NoError(t, vm.StepInto()) // LDSFLD0
assert.Equal(t, 4, int(vm.refs))
require.NoError(t, vm.StepInto()) // APPEND
assert.Equal(t, 3, int(vm.refs))
require.NoError(t, vm.StepInto()) // DROP
assert.Equal(t, 1, int(vm.refs))
require.NoError(t, vm.StepInto()) // RET
assert.Equal(t, 0, int(vm.refs))
}
func makeProgram(opcodes ...opcode.Opcode) []byte {
prog := make([]byte, len(opcodes)+1) // RET
for i := 0; i < len(opcodes); i++ {