thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0048: Abort opening cmdwin if autocmds screw things up

Browse Source 
Problem:  Autocmds triggered from opening the cmdwin (in win_split and
          do_ecmd) can cause issues such as E199, as the current checks
          are insufficient.

Solution: Commands executed from the cmdwin apply to the old curwin/buf,
          so they should be kept in a "suspended" state; abort if
          they've changed. Also abort if cmdwin/buf was tampered with,
          and check that curwin is correct. Try to clean up the cmdwin
          buffer (only if hidden and non-current to simplify things; the
          same approach is used when closing cmdwin normally), and add a
          beep. (Sean Dewar)

It'd be nice to also check that curwin was *really* created by win_split, as
autocommands can change curwin before it returns (so it can't be assumed to be
that of the split); for now, this means that the cmdwin may not be the botwin in
that case, which is probably OK.

closes: #12819

Signed-off-by: Sean Dewar <seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Sean Dewar
2023-08-16 16:17:31 +01:00
committed by Christian Brabandt
parent 988f74311c
commit 43b395ec2e
6 changed files with 110 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/ex_getln.c
View File

@@ -4458,6 +4458,8 @@ open_cmdwin(void)
#ifdef FEAT_FOLDING
int save_KeyTyped;
#endif
int newbuf_status;
int cmdwin_valid;
// Can't do this when text or buffer is locked.
// Can't do this recursively. Can't do it when typing a password.
@@ -4491,6 +4493,16 @@ open_cmdwin(void)
ga_clear(&winsizes);
return K_IGNORE;
}
// win_split() autocommands may have messed with the old window or buffer.
// Treat it as abandoning this command-line.
if (!win_valid(old_curwin) || curwin == old_curwin
|| !bufref_valid(&old_curbuf)
|| old_curwin->w_buffer != old_curbuf.br_buf)
{
beep_flush();
ga_clear(&winsizes);
return Ctrl_C;
}
// Don't let quitting the More prompt make this fail.
got_int = FALSE;
@@ -4498,14 +4510,29 @@ open_cmdwin(void)
cmdwin_type = get_cmdline_type();
cmdwin_win = curwin;
// Create the command-line buffer empty.
if (do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL) == FAIL)
// Create empty command-line buffer. Be especially cautious of BufLeave
// autocommands from do_ecmd(), as cmdwin restrictions do not apply to them!
newbuf_status = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE,
NULL);
cmdwin_valid = win_valid(cmdwin_win);
if (newbuf_status == FAIL || !cmdwin_valid || curwin != cmdwin_win ||
!win_valid(old_curwin) || !bufref_valid(&old_curbuf) ||
old_curwin->w_buffer != old_curbuf.br_buf)
{
// Some autocommand messed it up?
win_close(curwin, TRUE);
ga_clear(&winsizes);
if (newbuf_status == OK)
set_bufref(&bufref, curbuf);
if (cmdwin_valid && !last_window())
win_close(cmdwin_win, TRUE);
// win_close() autocommands may have already deleted the buffer.
if (newbuf_status == OK && bufref_valid(&bufref) &&
bufref.br_buf != curbuf)
close_buffer(NULL, bufref.br_buf, DOBUF_WIPE, FALSE, FALSE);
cmdwin_type = 0;
cmdwin_win = NULL;
beep_flush();
ga_clear(&winsizes);
return Ctrl_C;
}
cmdwin_buf = curbuf;
@@ -4622,12 +4649,13 @@ open_cmdwin(void)
cmdwin_win = NULL;
exmode_active = save_exmode;
// Safety check: The old window or buffer was deleted: It's a bug when
// this happens!
if (!win_valid(old_curwin) || !bufref_valid(&old_curbuf))
// Safety check: The old window or buffer was changed or deleted: It's a bug
// when this happens!
if (!win_valid(old_curwin) || !bufref_valid(&old_curbuf)
|| old_curwin->w_buffer != old_curbuf.br_buf)
{
cmdwin_result = Ctrl_C;
emsg(_(e_active_window_or_buffer_deleted));
emsg(_(e_active_window_or_buffer_changed_or_deleted));
}
else
{