Permalink
Browse files

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)
  • Loading branch information...
brammool committed Jul 8, 2017
1 parent 710b4a1 commit 0ea5070d79c8a13fb2403280a72f968495b0fab7
Showing with 25 additions and 2 deletions.
  1. +5 −2 src/ex_docmd.c
  2. +18 −0 src/testdir/test_tabpage.vim
  3. +2 −0 src/version.c
View
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
700,
/**/
699,
/**/

0 comments on commit 0ea5070

Please sign in to comment.