changeset 23410:ae3421daa981 v8.2.2248

patch 8.2.2248: ASAN error on exit with GUI Commit: https://github.com/vim/vim/commit/2808da39f9aad674d25df784da636e42372b78e3 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Dec 30 14:08:35 2020 +0100 patch 8.2.2248: ASAN error on exit with GUI Problem: ASAN error on exit with GUI. Solution: Check the window still has lines. (Christian Brabandt, closes #7573)
author Bram Moolenaar <Bram@vim.org>
date Wed, 30 Dec 2020 14:15:03 +0100
parents ef51b83c110f
children 80df4b462780
files src/term.c src/version.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/term.c
+++ b/src/term.c
@@ -3411,9 +3411,10 @@ set_shellsize(int width, int height, int
 	return;
 
     // curwin->w_buffer can be NULL when we are closing a window and the
-    // buffer has already been closed and removing a scrollbar causes a resize
-    // event. Don't resize then, it will happen after entering another buffer.
-    if (curwin->w_buffer == NULL)
+    // buffer (or window) has already been closed and removing a scrollbar
+    // causes a resize event. Don't resize then, it will happen after entering
+    // another buffer.
+    if (curwin->w_buffer == NULL || curwin->w_lines == NULL)
 	return;
 
     ++busy;
--- 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 */
 /**/
+    2248,
+/**/
     2247,
 /**/
     2246,