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

vim-patch:8.2.0371: crash with combination of terminal popup and autocmd (#37433)

Browse Source 
Problem:    Crash with combination of terminal popup and autocmd.
Solution:   Disallow closing a popup that is the current window.  Add a check
            that the current buffer is valid. (closes vim/vim#5754)

cee52204ca

Cherry-pick related changes from patch 9.0.1454.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2026-01-17 19:53:58 +08:00
committed by GitHub
parent b4ce549f2a
commit f3cfe9a94b
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/buffer.c
View File

@@ -116,6 +116,17 @@
#include "buffer.c.generated.h" #include "buffer.c.generated.h"
#ifdef ABORT_ON_INTERNAL_ERROR
# define CHECK_CURBUF \
do { \
if (curwin != NULL && curwin->w_buffer != curbuf) { \
iemsg("curbuf != curwin->w_buffer"); \
} \
} while (0)
#else
# define CHECK_CURBUF do {} while (0)
#endif
static const char e_attempt_to_delete_buffer_that_is_in_use_str[] static const char e_attempt_to_delete_buffer_that_is_in_use_str[]
= N_("E937: Attempt to delete a buffer that is in use: %s"); = N_("E937: Attempt to delete a buffer that is in use: %s");
@@ -544,6 +555,8 @@ bool close_buffer(win_T *win, buf_T *buf, int action, bool abort_if_last, bool i
win_T *the_curwin = curwin; win_T *the_curwin = curwin;
tabpage_T *the_curtab = curtab; tabpage_T *the_curtab = curtab;
CHECK_CURBUF;
// Force unloading or deleting when 'bufhidden' says so, but not for terminal // Force unloading or deleting when 'bufhidden' says so, but not for terminal
// buffers. // buffers.
// The caller must take care of NOT deleting/freeing when 'bufhidden' is // The caller must take care of NOT deleting/freeing when 'bufhidden' is
@@ -938,6 +951,9 @@ static void free_buffer(buf_T *buf)
au_pending_free_buf = buf; au_pending_free_buf = buf;
} else { } else {
xfree(buf); xfree(buf);
if (curbuf == buf) {
curbuf = NULL; // make clear it's not to be used
}
} }
} }