Mercurial > vim
changeset 33291:4cb421ba3385 v9.0.1911
patch 9.0.1911: Vim9: segfault with null object and instanceof()
Commit: https://github.com/vim/vim/commit/3da696db6ac6103eb8f07cf7be23fa0e12c2419d
Author: Ernie Rael <errael@raelity.com>
Date: Tue Sep 19 20:14:18 2023 +0200
patch 9.0.1911: Vim9: segfault with null object and instanceof()
Problem: Vim9: segfault with null object and instanceof()
Solution: return early
closes: #13121
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Ernie Rael <errael@raelity.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 19 Sep 2023 20:30:07 +0200 |
| parents | 9a7b1f8aea55 |
| children | 0da29d2fccef |
| files | src/testdir/test_vim9_class.vim src/version.c src/vim9class.c |
| diffstat | 3 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -3032,6 +3032,10 @@ def Test_instanceof() assert_true(instanceof(a3, [Base1, Base2, Intf1])) enddef Foo() + + var o_null: Base1 + assert_false(instanceof(o_null, Base1)) + END v9.CheckSourceSuccess(lines) enddef
--- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1911, +/**/ 1910, /**/ 1909,
--- a/src/vim9class.c +++ b/src/vim9class.c @@ -2865,6 +2865,9 @@ f_instanceof(typval_T *argvars, typval_T || check_for_class_or_list_arg(argvars, 1) == FAIL) return; + if (object_tv->vval.v_object == NULL) + return; + if (classinfo_tv->v_type == VAR_LIST) { FOR_ALL_LIST_ITEMS(classinfo_tv->vval.v_list, li)