mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0342: crash when a callback deletes a window that is being used

Browse Source 
Problem:    Crash when a callback deletes a window that is being used.
Solution:   Do not unload a buffer that is being displayed while redrawing the
            screen. Also avoid invoking callbacks while redrawing.
            (closes vim/vim#2107)
94f01956a5

Omit parse_queued_messages(): N/A.
Cherry-pick a break statement from patch 8.1.0425.
This commit is contained in:
zeertzjq
2022-07-05 17:33:23 +08:00
parent e26b48bde6
commit 65cbe0cc35
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/nvim/buffer.c
View File

@@ -93,7 +93,6 @@
#endif
static char *e_auabort = N_("E855: Autocommands caused command to abort");
static char *e_buflocked = N_("E937: Attempt to delete a buffer that is in use");
// Number of times free_buffer() was called.
static int buf_free_count = 0;
@@ -401,6 +400,27 @@ bool buf_valid(buf_T *buf)
return false;
}
/// Return true when buffer "buf" can be unloaded.
/// Give an error message and return false when the buffer is locked or the
/// screen is being redrawn and the buffer is in a window.
static bool can_unload_buffer(buf_T *buf)
{
bool can_unload = !buf->b_locked;
if (can_unload && updating_screen) {
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (wp->w_buffer == buf) {
can_unload = false;
break;
}
}
}
if (!can_unload) {
emsg(_("E937: Attempt to delete a buffer that is in use"));
}
return can_unload;
}
/// Close the link to a buffer.
///
/// @param win If not NULL, set b_last_cursor.
@@ -458,8 +478,7 @@ bool close_buffer(win_T *win, buf_T *buf, int action, bool abort_if_last, bool i
// Disallow deleting the buffer when it is locked (already being closed or
// halfway a command that relies on it). Unloading is allowed.
if (buf->b_locked > 0 && (del_buf || wipe_buf)) {
emsg(_(e_buflocked));
if ((del_buf || wipe_buf) && !can_unload_buffer(buf)) {
return false;
}
@@ -1206,8 +1225,7 @@ int do_buffer(int action, int start, int dir, int count, int forceit)
if (unload) {
int forward;
bufref_T bufref;
if (buf->b_locked) {
emsg(_(e_buflocked));
if (!can_unload_buffer(buf)) {
return FAIL;
}
set_bufref(&bufref, buf);