From 8c6951fa2836a1ae3257770e7b927a9380439912 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 6 Feb 2021 18:08:45 +0100 Subject: patch 8.2.2473: crash when leaving command line window triggers autocommand Problem: Crash when leaving command line window triggers autocommand. (houyunsong) Solution: Make sure not to close the current window or buffer. --- src/ex_getln.c | 6 +++--- src/testdir/test_autocmd.vim | 9 +++++++++ src/version.c | 2 ++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/ex_getln.c b/src/ex_getln.c index d6712c126..faa56e14b 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4403,12 +4403,12 @@ open_cmdwin(void) // win_goto() may trigger an autocommand that already closes the // cmdline window. - if (win_valid(wp)) + if (win_valid(wp) && wp != curwin) win_close(wp, TRUE); // win_close() may have already wiped the buffer when 'bh' is - // set to 'wipe' - if (bufref_valid(&bufref)) + // set to 'wipe', autocommands may have closed other windows + if (bufref_valid(&bufref) && bufref.br_buf != curbuf) close_buffer(NULL, bufref.br_buf, DOBUF_WIPE, FALSE, FALSE); // Restore window sizes. diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 8ccc753df..15d237ee1 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2774,4 +2774,13 @@ func Test_autocmd_normal_mess() augroup END endfunc +func Test_autocmd_closing_cmdwin() + au BufWinLeave * nested q + call assert_fails("norm 7q?\n", 'E855:') + + au! BufWinLeave + new + only +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 1b0faaeee..254aafdb8 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2473, /**/ 2472, /**/ -- cgit v1.2.1