Mercurial > vim

diff src/window.c @ 22399:75513701ddd2 v8.2.1748

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 860cad58f557
children b74bdd85bb26
line wrap: on
line diff
--- 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;
 }