diff options
| author | Ernie Rael <errael@raelity.com> | 2024-06-23 09:54:45 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-06-23 09:54:45 +0200 |
| commit | 8625714ac13cba271f60687b33f0b63bd29feba1 (patch) | |
| tree | 6d25e824b33e68dc43aae82e79f8e97d3aca32c9 | |
| parent | 7b29cc97d6c1450865969d08c5538a40c304593c (diff) | |
patch 9.1.0515: Vim9: segfault in object_equal()v9.1.0515
Problem: Vim9: segfault in object_equal()
Solution: test for object pointer being NULL, before dereferencing them
(Ernie Rael)
closes: #15085
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 | 14 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9class.c | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index c363cf0a9a..a043f8c699 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -10502,6 +10502,20 @@ def Test_Object_Compare_With_Recursive_Class_Ref() assert_equal(true, result) END v9.CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + + class C + public var nest: C + endclass + var o1 = C.new() + var o2 = C.new(C.new()) + + var result = o1 == o2 + assert_equal(false, result) + END + v9.CheckScriptSuccess(lines) enddef " Test for using a compound operator from a lambda function in an object method diff --git a/src/version.c b/src/version.c index 391ac7365e..357f9c1e39 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 */ /**/ + 515, +/**/ 514, /**/ 513, diff --git a/src/vim9class.c b/src/vim9class.c index 4d0b4e8dd6..5d68459de8 100644 --- a/src/vim9class.c +++ b/src/vim9class.c @@ -3855,6 +3855,8 @@ object_equal( if (o1 == o2) return TRUE; + if (o1 == NULL || o2 == NULL) + return FALSE; cl1 = o1->obj_class; cl2 = o2->obj_class; |