forked from aniani/vim
patch 8.2.1950: Vim9: crash when compiling function fails when getting type
Problem: Vim9: crash when compiling function fails when getting type. Solution: Handle NULL type. (closes #7253)
This commit is contained in:
@@ -1749,6 +1749,15 @@ def Test_expr7_list_vim9script()
|
|||||||
var l: list<string> = [234, 'x']
|
var l: list<string> = [234, 'x']
|
||||||
END
|
END
|
||||||
CheckScriptFailure(lines, 'E1012:', 2)
|
CheckScriptFailure(lines, 'E1012:', 2)
|
||||||
|
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
def Failing()
|
||||||
|
job_stop()
|
||||||
|
enddef
|
||||||
|
var list = [Failing]
|
||||||
|
END
|
||||||
|
CheckScriptFailure(lines, 'E119:', 1)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
def LambdaWithComments(): func
|
def LambdaWithComments(): func
|
||||||
@@ -2009,6 +2018,15 @@ def Test_expr7_dict_vim9script()
|
|||||||
var l: dict<string> = #{a: 234, b: 'x'}
|
var l: dict<string> = #{a: 234, b: 'x'}
|
||||||
END
|
END
|
||||||
CheckScriptFailure(lines, 'E1012:', 2)
|
CheckScriptFailure(lines, 'E1012:', 2)
|
||||||
|
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
def Failing()
|
||||||
|
job_stop()
|
||||||
|
enddef
|
||||||
|
var dict = #{name: Failing}
|
||||||
|
END
|
||||||
|
CheckScriptFailure(lines, 'E119:', 1)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
let g:oneString = 'one'
|
let g:oneString = 'one'
|
||||||
|
@@ -750,6 +750,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 */
|
||||||
|
/**/
|
||||||
|
1950,
|
||||||
/**/
|
/**/
|
||||||
1949,
|
1949,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -108,7 +108,7 @@ get_list_type(type_T *member_type, garray_T *type_gap)
|
|||||||
type_T *type;
|
type_T *type;
|
||||||
|
|
||||||
// recognize commonly used types
|
// 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;
|
return &t_list_any;
|
||||||
if (member_type->tt_type == VAR_VOID
|
if (member_type->tt_type == VAR_VOID
|
||||||
|| member_type->tt_type == VAR_UNKNOWN)
|
|| member_type->tt_type == VAR_UNKNOWN)
|
||||||
@@ -137,7 +137,7 @@ get_dict_type(type_T *member_type, garray_T *type_gap)
|
|||||||
type_T *type;
|
type_T *type;
|
||||||
|
|
||||||
// recognize commonly used types
|
// 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;
|
return &t_dict_any;
|
||||||
if (member_type->tt_type == VAR_VOID
|
if (member_type->tt_type == VAR_VOID
|
||||||
|| member_type->tt_type == VAR_UNKNOWN)
|
|| 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.
|
* Return FAIL if "expected" and "actual" don't match.
|
||||||
|
* When "argidx" > 0 it is included in the error message.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
check_typval_type(type_T *expected, typval_T *actual_tv, int argidx)
|
check_typval_type(type_T *expected, typval_T *actual_tv, int argidx)
|
||||||
|
Reference in New Issue
Block a user