mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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 #7416)
This commit is contained in:
@@ -1794,6 +1794,25 @@ def Test_abort_even_with_silent()
|
|||||||
enddef
|
enddef
|
||||||
sil! Func()
|
sil! Func()
|
||||||
assert_equal('none', g:result)
|
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
|
END
|
||||||
CheckScriptSuccess(lines)
|
CheckScriptSuccess(lines)
|
||||||
enddef
|
enddef
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
2095,
|
||||||
/**/
|
/**/
|
||||||
2094,
|
2094,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -2669,6 +2669,15 @@ call_def_function(
|
|||||||
{
|
{
|
||||||
SOURCING_LNUM = iptr->isn_lnum;
|
SOURCING_LNUM = iptr->isn_lnum;
|
||||||
semsg(_(e_dictkey), key);
|
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;
|
goto on_fatal_error;
|
||||||
}
|
}
|
||||||
clear_tv(tv);
|
clear_tv(tv);
|
||||||
|
Reference in New Issue
Block a user