patch 9.0.1864: still crash with bt_quickfix1_poc
Problem: crash with bt_quickfix1_poc when cleaning up
and EXITFREE is defined
Solution: Test if buffer is valid in a window, else close
window directly, don't try to access buffer properties
While at it, increase the crash timeout slightly, so that CI has a
chance to finish processing the test_crash() test.
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index b997cc1..8c79d3a 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -40,7 +40,7 @@
" clean up
call delete('Xerr')
" This test takes a bit longer
- call TermWait(buf, 500)
+ call TermWait(buf, 1000)
let file = 'crash/poc_tagfunc.vim'
let args = printf(cmn_args, vim, file)
@@ -55,7 +55,7 @@
\ ' && echo "crash 6: [OK]" >> X_crash1_result.txt' .. "\<cr>")
" clean up
call delete('X')
- call TermWait(buf, 200)
+ call TermWait(buf, 1000)
" clean up
exe buf .. "bw!"
diff --git a/src/version.c b/src/version.c
index a19b81e..c2faee4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1864,
+/**/
1863,
/**/
1862,
diff --git a/src/window.c b/src/window.c
index 152365e..1af2395 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4158,6 +4158,13 @@
if (wp == curwin) // don't close current window
continue;
+ // autoccommands messed this one up
+ if (!buf_valid(wp->w_buffer) && win_valid(wp))
+ {
+ wp->w_buffer = NULL;
+ win_close(wp, 0);
+ continue;
+ }
// Check if it's allowed to abandon this window
r = can_abandon(wp->w_buffer, forceit);
if (!win_valid(wp)) // autocommands messed wp up