mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-05-03 20:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): crash when TermClose deletes other buffers

Browse Source 
Problem:  Crash when deleting terminal buffer and TermClose deletes
          other buffers.
Solution: Close the terminal after restoring b_nwindows.
This commit is contained in:
zeertzjq
2026-01-05 14:11:39 +08:00
parent d42fa1753a
commit 7297e9d339
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/buffer.c
View File

@@ -648,10 +648,6 @@ bool close_buffer(win_T *win, buf_T *buf, int action, bool abort_if_last, bool i
return true;
}
if (buf->terminal) {
buf_close_terminal(buf);
}
// Always remove the buffer when there is no file name.
if (buf->b_ffname == NULL) {
del_buf = true;
@@ -675,6 +671,15 @@ bool close_buffer(win_T *win, buf_T *buf, int action, bool abort_if_last, bool i
buf->b_nwindows = nwindows;
if (buf->terminal) {
buf_close_terminal(buf);
// Must check this before calling buf_freeall(), otherwise is_curbuf will be true
// in buf_freeall() but still false here, leading to a 0-line buffer.
if (buf == curbuf && !is_curbuf) {
return false;
}
}
buf_freeall(buf, ((del_buf ? BFA_DEL : 0)
+ (wipe_buf ? BFA_WIPE : 0)
+ (ignore_abort ? BFA_IGNORE_ABORT : 0)));