Mercurial > vim
changeset 22399:75513701ddd2 v8.2.1748
patch 8.2.1748: closing split window in other tab may cause a crash
Commit: https://github.com/vim/vim/commit/f3c51bbff1256a52bdd9ede7887f40062be2628c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 26 19:11:39 2020 +0200
patch 8.2.1748: closing split window in other tab may cause a crash
Problem: Closing split window in other tab may cause a crash.
Solution: Set tp_curwin properly. (Rob Pilling, closes https://github.com/vim/vim/issues/7018)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 26 Sep 2020 19:15:03 +0200 |
parents | ca9544b14e58 |
children | 6fc35e257910 |
files | src/testdir/test_winbuf_close.vim src/version.c src/window.c |
diffstat | 3 files changed, 24 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_winbuf_close.vim +++ b/src/testdir/test_winbuf_close.vim @@ -192,7 +192,23 @@ func Test_tabwin_close() call win_execute(l:wid, 'close') " Should not crash. call assert_true(v:true) - %bwipe! + + " This tests closing a window in another tab, while leaving the tab open + " i.e. two windows in another tab. + tabedit + let w:this_win = 42 + new + let othertab_wid = win_getid() + tabprevious + call win_execute(othertab_wid, 'q') + " drawing the tabline helps check that the other tab's windows and buffers + " are still valid + redrawtabline + " but to be certain, ensure we can focus the other tab too + tabnext + call assert_equal(42, w:this_win) + + bwipe! endfunc " Test when closing a split window (above/below) restores space to the window
--- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1748, +/**/ 1747, /**/ 1746,
--- a/src/window.c +++ b/src/window.c @@ -2745,6 +2745,7 @@ win_free_mem( { frame_T *frp; win_T *wp; + tabpage_T *win_tp = tp == NULL ? curtab : tp; // Remove the window and its frame from the tree of frames. frp = win->w_frame; @@ -2752,10 +2753,10 @@ win_free_mem( vim_free(frp); win_free(win, tp); - // When deleting the current window of another tab page select a new - // current window. - if (tp != NULL && win == tp->tp_curwin) - tp->tp_curwin = wp; + // When deleting the current window in the tab, select a new current + // window. + if (win == win_tp->tp_curwin) + win_tp->tp_curwin = wp; return wp; }