mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.0.0700: segfault with QuitPre autocommand closes the window
Problem: Segfault with QuitPre autocommand closes the window. (Marek) Solution: Check that the window pointer is still valid. (Christian Brabandt, closes #1817)
This commit is contained in:
@@ -7271,8 +7271,11 @@ ex_quit(exarg_T *eap)
|
||||
apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, curbuf);
|
||||
/* Refuse to quit when locked or when the buffer in the last window is
|
||||
* being closed (can only happen in autocommands). */
|
||||
if (curbuf_locked() || (wp->w_buffer->b_nwindows == 1
|
||||
&& wp->w_buffer->b_locked > 0))
|
||||
if (curbuf_locked()
|
||||
# ifdef FEAT_WINDOWS
|
||||
|| !win_valid(wp)
|
||||
# endif
|
||||
|| (wp->w_buffer->b_nwindows == 1 && wp->w_buffer->b_locked > 0))
|
||||
return;
|
||||
#endif
|
||||
|
||||
|
@@ -473,5 +473,23 @@ func Test_tabnext_on_buf_unload2()
|
||||
endwhile
|
||||
endfunc
|
||||
|
||||
func Test_close_on_quitpre()
|
||||
" This once caused a crash
|
||||
new
|
||||
only
|
||||
set bufhidden=delete
|
||||
au QuitPre <buffer> close
|
||||
tabnew tab1
|
||||
tabnew tab2
|
||||
1tabn
|
||||
q!
|
||||
call assert_equal(1, tabpagenr())
|
||||
call assert_equal(2, tabpagenr('$'))
|
||||
" clean up
|
||||
while tabpagenr('$') > 1
|
||||
bwipe!
|
||||
endwhile
|
||||
1b
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
@@ -764,6 +764,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
700,
|
||||
/**/
|
||||
699,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user