Mercurial > vim
changeset 23098:bdafc132a4a1 v8.2.2095
patch 8.2.2095: Vim9: crash when failed dict member is followed by concat
Commit: https://github.com/vim/vim/commit/4029cabbe7c68a304ab8becb495bd6d91c6e97b1
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 5 18:13:27 2020 +0100
patch 8.2.2095: Vim9: crash when failed dict member is followed by concat
Problem: Vim9: crash when failed dict member is followed by concatenation.
Solution: Remove the dict from the stack. (closes https://github.com/vim/vim/issues/7416)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 05 Dec 2020 18:15:04 +0100 |
| parents | 409258cef9ec |
| children | 2f167df12800 |
| files | src/testdir/test_vim9_func.vim src/version.c src/vim9execute.c |
| diffstat | 3 files changed, 30 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1794,6 +1794,25 @@ def Test_abort_even_with_silent() enddef sil! Func() assert_equal('none', g:result) + unlet g:result + END + CheckScriptSuccess(lines) +enddef + +def Test_dict_member_with_silent() + var lines =<< trim END + vim9script + g:result = 'none' + var d: dict<any> + def Func() + try + g:result = map([], {_, v -> {}[v]})->join() .. d[''] + catch + endtry + enddef + silent! Func() + assert_equal('0', g:result) + unlet g:result END CheckScriptSuccess(lines) enddef
--- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2095, +/**/ 2094, /**/ 2093,
--- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -2669,6 +2669,15 @@ call_def_function( { SOURCING_LNUM = iptr->isn_lnum; semsg(_(e_dictkey), key); + + // If :silent! is used we will continue, make sure the + // stack contents makes sense. + clear_tv(tv); + --ectx.ec_stack.ga_len; + tv = STACK_TV_BOT(-1); + clear_tv(tv); + tv->v_type = VAR_NUMBER; + tv->vval.v_number = 0; goto on_fatal_error; } clear_tv(tv);