neovim

commit 1274380029313d820c9a0c28d10d606ddb27aacd
parent 2371b9303d6b724c0e8c057239d00575c96d51f6
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri, 17 Nov 2023 09:19:01 +0800

vim-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.

https://github.com/vim/vim/commit/623ba31821a41acee7e948794e84867680b97885

Co-authored-by: Christian Brabandt <cb@256bit.org>

Diffstat:
M
src/nvim/window.c
 | 
6
++++++
M
test/old/testdir/test_crash.vim
 | 
4
++--

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/nvim/window.c b/src/nvim/window.c
@@ -3776,6 +3776,12 @@ void close_others(int message, int forceit)
       continue;
     }
 
+    // autoccommands messed this one up
+    if (!buf_valid(wp->w_buffer) && win_valid(wp)) {
+      wp->w_buffer = NULL;
+      win_close(wp, false, false);
+      continue;
+    }
     // Check if it's allowed to abandon this window
     int r = can_abandon(wp->w_buffer, forceit);
     if (!win_valid(wp)) {             // autocommands messed wp up
diff --git a/test/old/testdir/test_crash.vim b/test/old/testdir/test_crash.vim
@@ -40,7 +40,7 @@ func Test_crash1()
   " 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 @@ func Test_crash1()
     \ '  && 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!"