From: Christian Brabandt <cb@256bit.org>
Date: Mon, 20 Jan 2025 21:55:57 +0000 (+0100)
Subject: patch 9.1.1043: [security]: segfault in win_line()
X-Git-Tag: v9.1.1043^0
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9d1bed5eccdbb46a26b8a484f5e9163c40e63919;p=thirdparty%2Fvim.git

patch 9.1.1043: [security]: segfault in win_line()

Problem:  [security]: segfault in win_line()
          (fizz-is-on-the-way)
Solution: Check that ScreenLines is not NULL

Github Advisory:
https://github.com/vim/vim/security/advisories/GHSA-j3g9-wg22-v955

Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/src/gui.c b/src/gui.c
index 8e7b079a5a..86c40de632 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -4478,13 +4478,15 @@ gui_do_scroll(void)
     /*
      * Don't call updateWindow() when nothing has changed (it will overwrite
      * the status line!).
+     *
+     * Check for ScreenLines, because in ex-mode, we don't have a valid display.
      */
-    if (old_topline != wp->w_topline
+    if (ScreenLines != NULL && (old_topline != wp->w_topline
 	    || wp->w_redr_type != 0
 #ifdef FEAT_DIFF
 	    || old_topfill != wp->w_topfill
 #endif
-	    )
+	    ))
     {
 	int type = UPD_VALID;
 
diff --git a/src/testdir/crash/ex_redraw_crash b/src/testdir/crash/ex_redraw_crash
new file mode 100644
index 0000000000..eda294cae1
--- /dev/null
+++ b/src/testdir/crash/ex_redraw_crash
@@ -0,0 +1 @@
+vdivvi|gIv|÷³X€ý\€ý,X€ýX€ý\€ý#
X€ý\„ý<€ý\€ý,X€ùX
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index bfd04ff10f..c83ddf29ea 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -234,6 +234,12 @@ func Test_crash1_3()
   call term_sendkeys(buf, args)
   call TermWait(buf, 50)
 
+  let file = 'crash/ex_redraw_crash'
+  let cmn_args = "%s -u NONE -i NONE -n -m -X -Z -e -s -S %s -c ':qa!'"
+  let args = printf(cmn_args, vim, file)
+  call term_sendkeys(buf, args)
+  call TermWait(buf, 150)
+
   " clean up
   exe buf .. "bw!"
   bw!
diff --git a/src/version.c b/src/version.c
index 286cbec8cd..7a2e5a8030 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1043,
 /**/
     1042,
 /**/