forked from aniani/vim
patch 9.1.0047: issues with temp curwin/buf while cmdwin is open
Problem: Things that temporarily change/restore curwin/buf (e.g: win_execute, some autocmds) may break assumptions that curwin/buf is the cmdwin when "cmdwin_type != 0", causing issues. Solution: Expose the cmdwin's real win/buf and check that instead. Also try to ensure these variables are NULL if "cmdwin_type == 0", allowing them to be used directly in most cases without checking cmdwin_type. (Sean Dewar) Alternatively, we could ban win_execute in the cmdwin and audit all places that temporarily change/restore curwin/buf, but I didn't notice any problems arising from allowing this (standard cmdwin restrictions still apply, so things that may actually break the cmdwin are still forbidden). 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:
committed by
Christian Brabandt
parent
4927110a43
commit
988f74311c
@@ -2782,9 +2782,16 @@ do_ecmd(
|
||||
{
|
||||
bufref_T save_au_new_curbuf;
|
||||
int save_cmdwin_type = cmdwin_type;
|
||||
win_T *save_cmdwin_win = cmdwin_win;
|
||||
|
||||
// Should only be possible to get here if the cmdwin is closed, or
|
||||
// if it's opening and its buffer hasn't been set yet (the new
|
||||
// buffer is for it).
|
||||
assert(cmdwin_buf == NULL);
|
||||
|
||||
// BufLeave applies to the old buffer.
|
||||
cmdwin_type = 0;
|
||||
cmdwin_win = NULL;
|
||||
|
||||
/*
|
||||
* Be careful: The autocommands may delete any buffer and change
|
||||
@@ -2801,7 +2808,10 @@ do_ecmd(
|
||||
save_au_new_curbuf = au_new_curbuf;
|
||||
set_bufref(&au_new_curbuf, buf);
|
||||
apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
|
||||
|
||||
cmdwin_type = save_cmdwin_type;
|
||||
cmdwin_win = save_cmdwin_win;
|
||||
|
||||
if (!bufref_valid(&au_new_curbuf))
|
||||
{
|
||||
// new buffer has been deleted
|
||||
|
Reference in New Issue
Block a user