mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.2.2083: Vim9: crash when using ":silent!" and getting member fails
Problem: Vim9: crash when using ":silent!" and getting member fails. Solution: Jump to on_fatal_error. (closes #7412)
This commit is contained in:
@@ -1768,5 +1768,19 @@ def Test_reset_did_emsg()
|
|||||||
CheckScriptFailure(lines, 'E492:', 8)
|
CheckScriptFailure(lines, 'E492:', 8)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
def Test_abort_even_with_silent()
|
||||||
|
var lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
g:result = 'none'
|
||||||
|
def Func()
|
||||||
|
eval {-> ''}() .. '' .. {}['X']
|
||||||
|
g:result = 'yes'
|
||||||
|
enddef
|
||||||
|
sil! Func()
|
||||||
|
assert_equal('none', g:result)
|
||||||
|
END
|
||||||
|
CheckScriptSuccess(lines)
|
||||||
|
enddef
|
||||||
|
|
||||||
|
|
||||||
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
|
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
2083,
|
||||||
/**/
|
/**/
|
||||||
2082,
|
2082,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -2669,12 +2669,12 @@ call_def_function(
|
|||||||
{
|
{
|
||||||
SOURCING_LNUM = iptr->isn_lnum;
|
SOURCING_LNUM = iptr->isn_lnum;
|
||||||
semsg(_(e_dictkey), key);
|
semsg(_(e_dictkey), key);
|
||||||
goto on_error;
|
goto on_fatal_error;
|
||||||
}
|
}
|
||||||
clear_tv(tv);
|
clear_tv(tv);
|
||||||
--ectx.ec_stack.ga_len;
|
--ectx.ec_stack.ga_len;
|
||||||
// Clear the dict after getting the item, to avoid that it
|
// Clear the dict only after getting the item, to avoid
|
||||||
// make the item invalid.
|
// that it makes the item invalid.
|
||||||
tv = STACK_TV_BOT(-1);
|
tv = STACK_TV_BOT(-1);
|
||||||
temp_tv = *tv;
|
temp_tv = *tv;
|
||||||
copy_tv(&di->di_tv, tv);
|
copy_tv(&di->di_tv, tv);
|
||||||
@@ -2997,10 +2997,12 @@ func_return:
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
on_error:
|
on_error:
|
||||||
|
// Jump here for an error that does not require aborting execution.
|
||||||
// If "emsg_silent" is set then ignore the error.
|
// If "emsg_silent" is set then ignore the error.
|
||||||
if (did_emsg_cumul + did_emsg == did_emsg_before && emsg_silent)
|
if (did_emsg_cumul + did_emsg == did_emsg_before && emsg_silent)
|
||||||
continue;
|
continue;
|
||||||
|
on_fatal_error:
|
||||||
|
// Jump here for an error that messes up the stack.
|
||||||
// If we are not inside a try-catch started here, abort execution.
|
// If we are not inside a try-catch started here, abort execution.
|
||||||
if (trylevel <= trylevel_at_start)
|
if (trylevel <= trylevel_at_start)
|
||||||
goto failed;
|
goto failed;
|
||||||
|
Reference in New Issue
Block a user