aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.2.1802: Vim9: crash with unterminated dict

Browse Source 
Problem:    Vim9: crash with unterminated dict. (Dhiraj Mishra)
Solution:   Return empty string instead of NULL. (closes #7084)
This commit is contained in:
Bram Moolenaar
2020-10-05 19:23:59 +02:00
parent 55b419b871
commit 44aefffaad
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/test_vim9_expr.vim
View File

@@ -1819,6 +1819,8 @@ def Test_expr7_dict()
CheckDefExecFailure(['var x: dict<number> = #{a: "x", b: 134}'], 'E1012:', 1) CheckDefExecFailure(['var x: dict<number> = #{a: "x", b: 134}'], 'E1012:', 1)
CheckDefExecFailure(['var x: dict<string> = #{a: 234, b: "1"}'], 'E1012:', 1) CheckDefExecFailure(['var x: dict<string> = #{a: 234, b: "1"}'], 'E1012:', 1)
CheckDefExecFailure(['var x: dict<string> = #{a: "x", b: 134}'], 'E1012:', 1) CheckDefExecFailure(['var x: dict<string> = #{a: "x", b: 134}'], 'E1012:', 1)
CheckDefFailure(['var x = ({'], 'E723:', 2)
enddef enddef
def Test_expr7_dict_vim9script() def Test_expr7_dict_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 */
/**/
1802,
/**/ /**/
1801, 1801,
/**/ /**/

3
src/vim9compile.c
View File

@@ -2822,7 +2822,10 @@ compile_dict(char_u **arg, cctx_T *cctx, int literal)
failret: failret:
if (*arg == NULL) if (*arg == NULL)
{
semsg(_(e_missing_dict_end), _("[end of lines]")); semsg(_(e_missing_dict_end), _("[end of lines]"));
*arg = (char_u *)"";
}
dict_unref(d); dict_unref(d);
return FAIL; return FAIL;
} }