diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-01-21 19:41:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-01-21 19:41:16 +0100 |
| commit | f904133e1a5ea84a124d3ece12b1f0a7392f1ca7 (patch) | |
| tree | b2d343765705678eb9fc461202332f5508773f88 /src/vim9execute.c | |
| parent | e71996bd0865659bde5450f466bc3e53e83431b2 (diff) | |
| download | vim-git-f904133e1a5ea84a124d3ece12b1f0a7392f1ca7.tar.gz | |
patch 8.2.2386: Vim9: crash when using ":silent! put"v8.2.2386
Problem: Vim9: crash when using ":silent! put".
Solution: When ignoring an error for ":silent!" rewind the stack and skip
ahead to restoring the cmdmod. (closes #7717)
Diffstat (limited to 'src/vim9execute.c')
| -rw-r--r-- | src/vim9execute.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/vim9execute.c b/src/vim9execute.c index 59a0982b3..b533617fc 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -1124,6 +1124,7 @@ call_def_function( msglist_T *private_msg_list = NULL; cmdmod_T save_cmdmod; int restore_cmdmod = FALSE; + int restore_cmdmod_stacklen = 0; int save_emsg_silent_def = emsg_silent_def; int save_did_emsg_def = did_emsg_def; int trylevel_at_start = trylevel; @@ -3398,6 +3399,7 @@ call_def_function( case ISN_CMDMOD: save_cmdmod = cmdmod; restore_cmdmod = TRUE; + restore_cmdmod_stacklen = ectx.ec_stack.ga_len; cmdmod = *iptr->isn_arg.cmdmod.cf_cmdmod; apply_cmdmod(&cmdmod); break; @@ -3523,7 +3525,22 @@ on_error: // when calling the function. if (did_emsg_cumul + did_emsg == did_emsg_before && emsg_silent && did_emsg_def == 0) + { + // If a sequence of instructions causes an error while ":silent!" + // was used, restore the stack length and jump ahead to restoring + // the cmdmod. + if (restore_cmdmod) + { + while (ectx.ec_stack.ga_len > restore_cmdmod_stacklen) + { + --ectx.ec_stack.ga_len; + clear_tv(STACK_TV_BOT(0)); + } + while (ectx.ec_instr[ectx.ec_iidx].isn_type != ISN_CMDMOD_REV) + ++ectx.ec_iidx; + } 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. |