diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-08 14:44:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-08 14:44:50 +0200 |
| commit | 0ea5070d79c8a13fb2403280a72f968495b0fab7 (patch) | |
| tree | b75f6e705f210716e624e65bcdb07da869784d2b | |
| parent | 710b4a16465fb38492801a0dccf2293397aadc6a (diff) | |
patch 8.0.0700: segfault with QuitPre autocommand closes the windowv8.0.0700
Problem: Segfault with QuitPre autocommand closes the window. (Marek)
Solution: Check that the window pointer is still valid. (Christian Brabandt,
closes #1817)
| -rw-r--r-- | src/ex_docmd.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_tabpage.vim | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 25 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 6ff578e655..8f427cfde0 100644 --- 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 diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim index c139958df3..239b1b965b 100644 --- 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 diff --git a/src/version.c b/src/version.c index 8cbbbf773f..7c1fb103ae 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 700, +/**/ 699, /**/ 698, |