Mercurial > vim
diff src/vim9execute.c @ 28343:909994047400 v8.2.4697
patch 8.2.4697: Vim9: crash when adding a duplicate key to a dictionary
Commit: https://github.com/vim/vim/commit/0d1f55c044610f627b1617e4cfbf6e094ff60921
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 5 17:30:29 2022 +0100
patch 8.2.4697: Vim9: crash when adding a duplicate key to a dictionary
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 05 Apr 2022 18:45:03 +0200 |
| parents | 62689b6765d6 |
| children | fabe722b24e9 |
line wrap: on
line diff
--- 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;