From f0e691442005c12a7c35746048f0942f44e23a4c Mon Sep 17 00:00:00 2001 From: Ernie Rael Date: Sat, 22 Jun 2024 11:12:00 +0200 Subject: patch 9.1.0513: Vim9: segfault with object comparison Problem: Vim9: segfault with object comparisons Solution: increment recusive_cnt before calling typval_compare_object() (Ernie Rael) closes: #15073 Signed-off-by: Ernie Rael Signed-off-by: Christian Brabandt --- src/testdir/test_vim9_class.vim | 18 ++++++++++++++++++ src/typval.c | 2 ++ src/version.c | 2 ++ 3 files changed, 22 insertions(+) diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index e92fcc5736..c363cf0a9a 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -10486,6 +10486,24 @@ def Test_Ref_Class_Within_Same_Class() v9.CheckScriptFailure(lines, 'E1347: Not a valid interface: A', 3) enddef +" Test for comparing a class referencing itself +def Test_Object_Compare_With_Recursive_Class_Ref() + var lines =<< trim END + vim9script + + class C + public var nest: C + endclass + + var o1 = C.new() + o1.nest = o1 + + var result = o1 == o1 + assert_equal(true, result) + END + v9.CheckScriptSuccess(lines) +enddef + " Test for using a compound operator from a lambda function in an object method def Test_compound_op_in_objmethod_lambda() # Test using the "+=" operator diff --git a/src/typval.c b/src/typval.c index 6a73719b71..76ce405a70 100644 --- a/src/typval.c +++ b/src/typval.c @@ -2114,7 +2114,9 @@ tv_equal( return tv1->vval.v_class == tv2->vval.v_class; case VAR_OBJECT: + ++recursive_cnt; (void)typval_compare_object(tv1, tv2, EXPR_EQUAL, ic, &r); + --recursive_cnt; return r; case VAR_PARTIAL: diff --git a/src/version.c b/src/version.c index 41d9281a37..e8f6a2d0d1 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 513, /**/ 512, /**/ -- cgit v1.2.3