From a88a8e13fcda131a0bd8fc6391f06091ca2a4d17 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Wed, 18 Sep 2019 14:10:10 +0300 Subject: [PATCH] vm: compare Array by reference in EQUAL --- pkg/vm/vm.go | 6 ++++++ pkg/vm/vm_test.go | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/pkg/vm/vm.go b/pkg/vm/vm.go index b533b1347..3592291a9 100644 --- a/pkg/vm/vm.go +++ b/pkg/vm/vm.go @@ -454,6 +454,12 @@ func (v *VM) execute(ctx *Context, op Instruction) { if a == nil { panic("no second-to-the-top element found") } + if ta, ok := a.value.(*ArrayItem); ok { + if tb, ok := b.value.(*ArrayItem); ok { + v.estack.PushVal(ta == tb) + break + } + } v.estack.PushVal(reflect.DeepEqual(a, b)) // Bit operations. diff --git a/pkg/vm/vm_test.go b/pkg/vm/vm_test.go index fd806b162..9d8e1ca0f 100644 --- a/pkg/vm/vm_test.go +++ b/pkg/vm/vm_test.go @@ -405,6 +405,27 @@ func TestEQUALGoodInteger(t *testing.T) { assert.Equal(t, &BoolItem{true}, vm.estack.Pop().value) } +func TestEQUALArrayTrue(t *testing.T) { + prog := makeProgram(DUP, EQUAL) + vm := load(prog) + vm.estack.PushVal([]StackItem{}) + vm.Run() + assert.Equal(t, false, vm.state.HasFlag(faultState)) + assert.Equal(t, 1, vm.estack.Len()) + assert.Equal(t, &BoolItem{true}, vm.estack.Pop().value) +} + +func TestEQUALArrayFalse(t *testing.T) { + prog := makeProgram(EQUAL) + vm := load(prog) + vm.estack.PushVal([]StackItem{}) + vm.estack.PushVal([]StackItem{}) + vm.Run() + assert.Equal(t, false, vm.state.HasFlag(faultState)) + assert.Equal(t, 1, vm.estack.Len()) + assert.Equal(t, &BoolItem{false}, vm.estack.Pop().value) +} + func TestNumEqual(t *testing.T) { prog := makeProgram(NUMEQUAL) vm := load(prog)