aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.2083: Vim9: crash when using ":silent!" and getting member fails

Browse Source 
Problem:    Vim9: crash when using ":silent!" and getting member fails.
Solution:   Jump to on_fatal_error. (closes #7412)
This commit is contained in:
Bram Moolenaar
2020-12-02 20:51:22 +01:00
parent e0de171ecd
commit af0df47a76
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vim9execute.c
View File

@@ -2669,12 +2669,12 @@ call_def_function(
{
SOURCING_LNUM = iptr->isn_lnum;
semsg(_(e_dictkey), key);
goto on_error;
goto on_fatal_error;
}
clear_tv(tv);
--ectx.ec_stack.ga_len;
// Clear the dict after getting the item, to avoid that it
// make the item invalid.
// Clear the dict only after getting the item, to avoid
// that it makes the item invalid.
tv = STACK_TV_BOT(-1);
temp_tv = *tv;
copy_tv(&di->di_tv, tv);
@@ -2997,10 +2997,12 @@ func_return:
continue;
on_error:
// Jump here for an error that does not require aborting execution.
// If "emsg_silent" is set then ignore the error.
if (did_emsg_cumul + did_emsg == did_emsg_before && emsg_silent)
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 (trylevel <= trylevel_at_start)
goto failed;