aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3382: crash when getting the type of a NULL partial

Browse Source 
Problem:    Crash when getting the type of a NULL partial.
Solution:   Check for NULL. (closes #8260)
This commit is contained in:
Bram Moolenaar 2021-08-28 14:58:44 +02:00
parent 5c56da4de8
commit c8103b4c25
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/testdir/test_vim9_builtin.vim
View File

@ -3679,6 +3679,15 @@ def Test_typename()
if has('float') if has('float')
assert_equal('func([unknown], [unknown]): float', typename(function('pow'))) assert_equal('func([unknown], [unknown]): float', typename(function('pow')))
endif endif
assert_equal('func', test_null_partial()->typename())
assert_equal('list<unknown>', test_null_list()->typename())
assert_equal('dict<unknown>', test_null_dict()->typename())
if has('job')
assert_equal('job', test_null_job()->typename())
endif
if has('channel')
assert_equal('channel', test_null_channel()->typename())
endif
enddef enddef
def Test_undofile() def Test_undofile()

2
src/version.c
View File

@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3382,
/**/ /**/
3381, 3381,
/**/ /**/

5
src/vim9type.c
View File

@ -327,7 +327,7 @@ typval2type_int(typval_T *tv, int copyID, garray_T *type_gap, int do_member)
char_u *name = NULL; char_u *name = NULL;
ufunc_T *ufunc = NULL; ufunc_T *ufunc = NULL;
if (tv->v_type == VAR_PARTIAL) if (tv->v_type == VAR_PARTIAL && tv->vval.v_partial != NULL)
{ {
if (tv->vval.v_partial->pt_func != NULL) if (tv->vval.v_partial->pt_func != NULL)
ufunc = tv->vval.v_partial->pt_func; ufunc = tv->vval.v_partial->pt_func;
@ -382,7 +382,8 @@ typval2type_int(typval_T *tv, int copyID, garray_T *type_gap, int do_member)
type->tt_type = tv->v_type; type->tt_type = tv->v_type;
type->tt_argcount = argcount; type->tt_argcount = argcount;
type->tt_min_argcount = min_argcount; type->tt_min_argcount = min_argcount;
if (tv->v_type == VAR_PARTIAL && tv->vval.v_partial->pt_argc > 0) if (tv->v_type == VAR_PARTIAL && tv->vval.v_partial != NULL
&& tv->vval.v_partial->pt_argc > 0)
{ {
type->tt_argcount -= tv->vval.v_partial->pt_argc; type->tt_argcount -= tv->vval.v_partial->pt_argc;
type->tt_min_argcount -= tv->vval.v_partial->pt_argc; type->tt_min_argcount -= tv->vval.v_partial->pt_argc;