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

patch 8.2.4697: Vim9: crash when adding a duplicate key to a dictionary

Browse Source 
Problem:    Vim9: crash when adding a duplicate key to a dictionary.
Solution:   Clear the stack item when it has been moved into the dictionary.
            (closes #10087)
This commit is contained in:
Bram Moolenaar
2022-04-05 17:30:29 +01:00
parent 478700336d
commit 0d1f55c044
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/testdir/test_vim9_expr.vim
View File

@@ -2774,6 +2774,9 @@ def Test_expr8_dict()
v9.CheckScriptFailure(['vim9script', "var x = {xxx: 1,"], 'E723:', 2) v9.CheckScriptFailure(['vim9script', "var x = {xxx: 1,"], 'E723:', 2)
v9.CheckDefAndScriptFailure(["var x = {['a']: xxx}"], ['E1001:', 'E121:'], 1) v9.CheckDefAndScriptFailure(["var x = {['a']: xxx}"], ['E1001:', 'E121:'], 1)
v9.CheckDefAndScriptFailure(["var x = {a: 1, a: 2}"], 'E721:', 1) v9.CheckDefAndScriptFailure(["var x = {a: 1, a: 2}"], 'E721:', 1)
g:key = 'x'
v9.CheckDefExecAndScriptFailure(["var x = {[g:key]: 'text', [g:key]: 'text'}"], 'E721:', 1)
unlet g:key
v9.CheckDefExecAndScriptFailure(["var x = g:anint.member"], ['E715:', 'E488:'], 1) v9.CheckDefExecAndScriptFailure(["var x = g:anint.member"], ['E715:', 'E488:'], 1)
v9.CheckDefExecAndScriptFailure(["var x = g:dict_empty.member"], 'E716:', 1) v9.CheckDefExecAndScriptFailure(["var x = g:dict_empty.member"], 'E716:', 1)

2
src/version.c
View File

@@ -746,6 +746,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 */
/**/
4697,
/**/ /**/
4696, 4696,
/**/ /**/

6
src/vim9execute.c
View File

@@ -196,8 +196,10 @@ exe_newdict(int count, ectx_T *ectx)
dict_unref(dict); dict_unref(dict);
return FAIL; return FAIL;
} }
item->di_tv = *STACK_TV_BOT(2 * (idx - count) + 1); tv = STACK_TV_BOT(2 * (idx - count) + 1);
item->di_tv = *tv;
item->di_tv.v_lock = 0; item->di_tv.v_lock = 0;
tv->v_type = VAR_UNKNOWN;
if (dict_add(dict, item) == FAIL) if (dict_add(dict, item) == FAIL)
{ {
// can this ever happen? // can this ever happen?
@@ -5363,7 +5365,7 @@ call_def_function(
did_emsg_def += save_did_emsg_def; did_emsg_def += save_did_emsg_def;
failed_early: failed_early:
// Free all local variables, but not arguments. // Free all arguments and local variables.
for (idx = 0; idx < ectx.ec_stack.ga_len; ++idx) for (idx = 0; idx < ectx.ec_stack.ga_len; ++idx)
clear_tv(STACK_TV(idx)); clear_tv(STACK_TV(idx));
ex_nesting_level = orig_nesting_level; ex_nesting_level = orig_nesting_level;