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.1789: Vim9: crash with invalid list constant

Browse Source 
Problem:    Vim9: crash with invalid list constant. (Dhiraj Mishra)
Solution:   Return FAIL when compiling the list fails. (closes #7066)
This commit is contained in:
Bram Moolenaar 2020-10-03 13:41:53 +02:00
parent 016faaa1b2
commit c1f0066b64
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/errors.h
View File

@ -276,4 +276,6 @@ EXTERN char e_final_requires_a_value[]
INIT(= N_("E1125: Final requires a value")); INIT(= N_("E1125: Final requires a value"));
EXTERN char e_cannot_use_let_in_vim9_script[] EXTERN char e_cannot_use_let_in_vim9_script[]
INIT(= N_("E1126: Cannot use :let in Vim9 script")); INIT(= N_("E1126: Cannot use :let in Vim9 script"));
EXTERN char e_missing_name_after_dot[]
INIT(= N_("E1127: Missing name after dot"));
#endif #endif

10
src/testdir/test_vim9_expr.vim
View File

@ -1538,6 +1538,16 @@ def Test_expr7_list()
CheckDefExecFailure(["var l: list<number> = ['x', 234]"], 'E1012:', 1) CheckDefExecFailure(["var l: list<number> = ['x', 234]"], 'E1012:', 1)
CheckDefExecFailure(["var l: list<string> = [234, 'x']"], 'E1012:', 1) CheckDefExecFailure(["var l: list<string> = [234, 'x']"], 'E1012:', 1)
CheckDefExecFailure(["var l: list<string> = ['x', 123]"], 'E1012:', 1) CheckDefExecFailure(["var l: list<string> = ['x', 123]"], 'E1012:', 1)
var lines =<< trim END
vim9script
var datalist: list<string>
def Main()
datalist += ['x'.
enddef
Main()
END
CheckScriptFailure(lines, 'E1127:')
enddef enddef
def Test_expr7_list_vim9script() def Test_expr7_list_vim9script()

2
src/version.c
View File

@ -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 */
/**/
1789,
/**/ /**/
1788, 1788,
/**/ /**/

5
src/vim9compile.c
View File

@ -2549,7 +2549,7 @@ compile_list(char_u **arg, cctx_T *cctx)
break; break;
} }
if (compile_expr0(&p, cctx) == FAIL) if (compile_expr0(&p, cctx) == FAIL)
break; return FAIL;
++count; ++count;
if (*p == ',') if (*p == ',')
{ {
@ -3333,7 +3333,10 @@ compile_subscript(
*arg = p + 1; *arg = p + 1;
if (may_get_next_line(*arg, arg, cctx) == FAIL) if (may_get_next_line(*arg, arg, cctx) == FAIL)
{
emsg(_(e_missing_name_after_dot));
return FAIL; return FAIL;
}
// dictionary member: dict.name // dictionary member: dict.name
p = *arg; p = *arg;
if (eval_isdictc(*p)) if (eval_isdictc(*p))