aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

patch 8.2.1950: Vim9: crash when compiling function fails when getting type

Browse Source 
Problem:    Vim9: crash when compiling function fails when getting type.
Solution:   Handle NULL type. (closes #7253)
This commit is contained in:
Bram Moolenaar
2020-11-04 12:00:53 +01:00
parent 348be7ed07
commit 9c13f76275
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/testdir/test_vim9_expr.vim
View File

@@ -1749,6 +1749,15 @@ def Test_expr7_list_vim9script()
var l: list<string> = [234, 'x']
END
CheckScriptFailure(lines, 'E1012:', 2)
lines =<< trim END
vim9script
def Failing()
job_stop()
enddef
var list = [Failing]
END
CheckScriptFailure(lines, 'E119:', 1)
enddef
def LambdaWithComments(): func
@@ -2009,6 +2018,15 @@ def Test_expr7_dict_vim9script()
var l: dict<string> = #{a: 234, b: 'x'}
END
CheckScriptFailure(lines, 'E1012:', 2)
lines =<< trim END
vim9script
def Failing()
job_stop()
enddef
var dict = #{name: Failing}
END
CheckScriptFailure(lines, 'E119:', 1)
enddef
let g:oneString = 'one'

2
src/version.c
View File

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

5
src/vim9type.c
View File

@@ -108,7 +108,7 @@ get_list_type(type_T *member_type, garray_T *type_gap)
type_T *type;
// recognize commonly used types
if (member_type->tt_type == VAR_ANY)
if (member_type == NULL || member_type->tt_type == VAR_ANY)
return &t_list_any;
if (member_type->tt_type == VAR_VOID
|| member_type->tt_type == VAR_UNKNOWN)
@@ -137,7 +137,7 @@ get_dict_type(type_T *member_type, garray_T *type_gap)
type_T *type;
// recognize commonly used types
if (member_type->tt_type == VAR_ANY)
if (member_type == NULL || member_type->tt_type == VAR_ANY)
return &t_dict_any;
if (member_type->tt_type == VAR_VOID
|| member_type->tt_type == VAR_UNKNOWN)
@@ -408,6 +408,7 @@ typval2type_vimvar(typval_T *tv, garray_T *type_gap)
/*
* Return FAIL if "expected" and "actual" don't match.
* When "argidx" > 0 it is included in the error message.
*/
int
check_typval_type(type_T *expected, typval_T *actual_tv, int argidx)