aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-11-17 09:19:01 +0800
committerzeertzjq <zeertzjq@outlook.com>2023-11-17 09:54:03 +0800
commit1274380029313d820c9a0c28d10d606ddb27aacd (patch)
tree7a08425fe64af07aa7a52dce875dca5a08e1fcc7 /src
parent2371b9303d6b724c0e8c057239d00575c96d51f6 (diff)
downloadrneovim-1274380029313d820c9a0c28d10d606ddb27aacd.tar.gz
rneovim-1274380029313d820c9a0c28d10d606ddb27aacd.tar.bz2
rneovim-1274380029313d820c9a0c28d10d606ddb27aacd.zip
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 (limited to 'src')
-rw-r--r--src/nvim/window.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 8ff8053118..89bdd7f5e0 100644
--- 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