diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-04-05 17:30:29 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-05 17:30:29 +0100 |
| commit | 0d1f55c044610f627b1617e4cfbf6e094ff60921 (patch) | |
| tree | 3fb509eb33b3b2407a260ae7d34582947f9695e7 | |
| parent | 478700336d1c72e133b8ff6841e968c1bb1658ed (diff) | |
patch 8.2.4697: Vim9: crash when adding a duplicate key to a dictionaryv8.2.4697
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)
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9execute.c | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 38b2afecd5..cd5f15207b 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -2774,6 +2774,9 @@ def Test_expr8_dict() v9.CheckScriptFailure(['vim9script', "var x = {xxx: 1,"], 'E723:', 2) v9.CheckDefAndScriptFailure(["var x = {['a']: xxx}"], ['E1001:', 'E121:'], 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:dict_empty.member"], 'E716:', 1) diff --git a/src/version.c b/src/version.c index 0e42966d96..9e1b5c7ef7 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4697, +/**/ 4696, /**/ 4695, diff --git a/src/vim9execute.c b/src/vim9execute.c index 6303cc117c..99135eadd2 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -196,8 +196,10 @@ exe_newdict(int count, ectx_T *ectx) dict_unref(dict); 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; + tv->v_type = VAR_UNKNOWN; if (dict_add(dict, item) == FAIL) { // can this ever happen? @@ -5363,7 +5365,7 @@ call_def_function( did_emsg_def += save_did_emsg_def; 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) clear_tv(STACK_TV(idx)); ex_nesting_level = orig_nesting_level; |