diff options
| author | Ernie Rael <errael@raelity.com> | 2024-06-22 11:12:00 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-06-22 11:12:00 +0200 |
| commit | f0e691442005c12a7c35746048f0942f44e23a4c (patch) | |
| tree | 8fc3b0b003fd8d76b5da30f6f4db866a27c7abe1 | |
| parent | 7002c055d560ae0b3bb1e24ad409390a5443daad (diff) | |
patch 9.1.0513: Vim9: segfault with object comparisonv9.1.0513
Problem: Vim9: segfault with object comparisons
Solution: increment recusive_cnt before calling typval_compare_object()
(Ernie Rael)
closes: #15073
Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_vim9_class.vim | 18 | ||||
| -rw-r--r-- | src/typval.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 22 insertions, 0 deletions
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 @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 513, +/**/ 512, /**/ 511, |