mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 21:48:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2354: crash with a weird combination of autocommands

Browse Source 
Problem:    Crash with a weird combination of autocommands.
Solution:   Increment b_nwindows when needed. (closes vim/vim#7674)
797e63b9f2
This commit is contained in:
Jan Edmund Lazo
2021-05-11 22:17:12 -04:00
parent 4338077632
commit f98433d82a
3 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/ex_cmds.c
View File

@@ -2462,6 +2462,7 @@ int do_ecmd(
auto_buf = true;
} else {
win_T *the_curwin = curwin;
buf_T *was_curbuf = curbuf;
// Set w_closing to avoid that autocommands close the window.
// Set b_locked for the same reason.
@@ -2475,9 +2476,10 @@ int do_ecmd(
// Close the link to the current buffer. This will set
// oldwin->w_buffer to NULL.
u_sync(false);
close_buffer(oldwin, curbuf,
(flags & ECMD_HIDE) || curbuf->terminal ? 0 : DOBUF_UNLOAD,
false);
const bool did_decrement = close_buffer(
oldwin, curbuf,
(flags & ECMD_HIDE) || curbuf->terminal ? 0 : DOBUF_UNLOAD,
false);
// Autocommands may have closed the window.
if (win_valid(the_curwin)) {
@@ -2497,6 +2499,14 @@ int do_ecmd(
goto theend;
}
if (buf == curbuf) { // already in new buffer
// close_buffer() has decremented the window count,
// increment it again here and restore w_buffer.
if (did_decrement && buf_valid(was_curbuf)) {
was_curbuf->b_nwindows++;
}
if (win_valid_any_tab(oldwin) && oldwin->w_buffer == NULL) {
oldwin->w_buffer = was_curbuf;
}
auto_buf = true;
} else {
// <VN> We could instead free the synblock