aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-26 20:03:41 -04:00
Code

patch 9.1.1253: abort when closing window with attached quickfix data

Browse Source 
Problem:  If win_close() is called with a window that has quickfix stack
          attached to it, the corresponding quickfix buffer will be
          closed and freed after the buffer was already closed. At that
          time curwin->w_buffer points to NULL, which the CHECK_CURBUF
          will catch and abort if ABORT_ON_ERROR is defined
Solution: in wipe_qf_buffer() temporarily point curwin->w_buffer back to
          curbuf, the window will be closed anyhow, so it shouldn't
          matter that curbuf->b_nwindows isn't incremented.

closes: #16993
closes: #16985

Co-authored-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt 2025-03-28 19:13:32 +01:00
parent c5aad6cca5
commit ce80c59bfd
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/quickfix.c
View File

@ -2035,10 +2035,24 @@ wipe_qf_buffer(qf_info_T *qi)
qfbuf = buflist_findnr(qi->qf_bufnr); qfbuf = buflist_findnr(qi->qf_bufnr);
if (qfbuf != NULL && qfbuf->b_nwindows == 0) if (qfbuf != NULL && qfbuf->b_nwindows == 0)
{ {
int buf_was_null = FALSE;
// can happen when curwin is going to be closed e.g. curwin->w_buffer
// was already closed in win_close(), and we are now closing the
// window related location list buffer from win_free_mem()
// but close_buffer() calls CHECK_CURBUF() macro and requires
// curwin->w_buffer == curbuf
if (curwin->w_buffer == NULL)
{
curwin->w_buffer = curbuf;
buf_was_null = TRUE;
}
// If the quickfix buffer is not loaded in any window, then // If the quickfix buffer is not loaded in any window, then
// wipe the buffer. // wipe the buffer.
close_buffer(NULL, qfbuf, DOBUF_WIPE, FALSE, FALSE); close_buffer(NULL, qfbuf, DOBUF_WIPE, FALSE, FALSE);
qi->qf_bufnr = INVALID_QFBUFNR; qi->qf_bufnr = INVALID_QFBUFNR;
if (buf_was_null)
curwin->w_buffer = NULL;
} }
} }

8
src/testdir/test_quickfix.vim
View File

@ -6718,4 +6718,12 @@ func Test_hardlink_fname()
call Xtest_hardlink_fname('l') call Xtest_hardlink_fname('l')
endfunc endfunc
func Test_quickfix_close_buffer_crash()
new
lexpr 'test' | lopen
wincmd k
lclose
wincmd q
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1253,
/**/ /**/
1252, 1252,
/**/ /**/