Skip to content

Commit

Permalink
Merge pull request #3688 from nspcc-dev/vm-fix-popitem-refcounting
Browse files Browse the repository at this point in the history
vm: fix incorrect refcounting in POPITEM
  • Loading branch information
AnnaShaleva authored Nov 18, 2024
2 parents 4a96bd1 + 270f0d2 commit 990634a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
14 changes: 14 additions & 0 deletions pkg/vm/ref_counter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package vm
import (
"testing"

"github.com/nspcc-dev/neo-go/pkg/vm/opcode"
"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -46,6 +47,19 @@ func TestRefCounter_Add(t *testing.T) {
require.Equal(t, 2, int(*r))
}

func TestRefCounterPopItem(t *testing.T) {
prog := makeProgram(opcode.POPITEM)
v := load(prog)
v.estack.PushVal(stackitem.NewArray([]stackitem.Item{stackitem.Make(42)}))
require.Equal(t, 2, int(v.refs))
runVM(t, v)
require.Equal(t, 1, v.estack.Len())
require.Equal(t, 1, int(v.refs))
_ = v.estack.Pop()
require.Equal(t, 0, v.estack.Len())
require.Equal(t, 0, int(v.refs))
}

func BenchmarkRefCounter_Add(b *testing.B) {
a := stackitem.NewArray(nil)
rc := newRefCounter()
Expand Down
1 change: 0 additions & 1 deletion pkg/vm/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,6 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
case *stackitem.Struct:
item.Remove(index)
}
v.refs.Remove(elem)

case opcode.SIZE:
elem := v.estack.Pop()
Expand Down

0 comments on commit 990634a

Please sign in to comment.