diff options
| author | Ernie Rael <errael@raelity.com> | 2024-08-19 21:45:23 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-08-19 21:47:35 +0200 |
| commit | cb90ea9cba6f033fe141db0e466fb4117f28402b (patch) | |
| tree | 0de214ceba937afe0bfde7ae4b7913f19a1c5c62 | |
| parent | 6bff6a2fa449b9149eb2db4851e0b62a173b8748 (diff) | |
patch 9.1.0682: Vim9: Segfault with uninitialized funcrefv9.1.0682
Problem: Vim9: Segfault with uninitialized funcref
(Daniel Viberg)
Solution: Check the Funcref for being Null before trying to access it
(Ernie Rael)
fixes: #15523
Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 10 | ||||
| -rw-r--r-- | src/userfunc.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index d07bbfba70..030ff833ef 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -164,6 +164,16 @@ def Test_wrong_function_name() END v9.CheckScriptFailure(lines, 'E1182:') delfunc g:Define + + lines =<< trim END + vim9script + var F1_ref: func + def Start() + F1_ref() + enddef + Start() + END + v9.CheckScriptFailure(lines, 'E117:') enddef " Check that in a legacy script a :def accesses the correct script variables. diff --git a/src/userfunc.c b/src/userfunc.c index 9a82394013..5d167101d8 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -2245,7 +2245,8 @@ find_func_imported(char_u *name, int flags) if (!HASHITEM_EMPTY(hi)) { dictitem_T *di = HI2DI(hi); - if (di->di_tv.v_type == VAR_FUNC) + if (di->di_tv.v_type == VAR_FUNC + && di->di_tv.vval.v_string != NULL) func = find_func_even_dead(di->di_tv.vval.v_string, flags); } } diff --git a/src/version.c b/src/version.c index 02b6d91dc6..c4472cf609 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 */ /**/ + 682, +/**/ 681, /**/ 680, |