Mercurial > vim
changeset 11635:70bc7b107610 v8.0.0700
patch 8.0.0700: segfault with QuitPre autocommand closes the window
commit https://github.com/vim/vim/commit/0ea5070d79c8a13fb2403280a72f968495b0fab7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 8 14:44:50 2017 +0200
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)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 08 Jul 2017 14:45:03 +0200 |
parents | 5f7d69dca4ec |
children | 0f5bf68f0ecc |
files | src/ex_docmd.c src/testdir/test_tabpage.vim src/version.c |
diffstat | 3 files changed, 25 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -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
--- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -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