From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 28 Oct 2017 12:45:16 +0000 (+0200)
Subject: patch 8.0.1228: invalid memory access in GUI test
X-Git-Tag: v8.0.1228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e19fc07e73214f94441cb3a495504a1de21eb07;p=vim

patch 8.0.1228: invalid memory access in GUI test

Problem:    Invalid memory access in GUI test.
Solution:   Check that the row is not outside of the screen.
---

diff --git a/src/screen.c b/src/screen.c
index c92b17ebb..05853d442 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2123,7 +2123,11 @@ win_update(win_T *wp)
 
 	    wp->w_lines[idx].wl_lnum = lnum;
 	    wp->w_lines[idx].wl_valid = TRUE;
-	    if (row > wp->w_height)	/* past end of screen */
+
+	    /* Past end of the window or end of the screen. Note that after
+	     * resizing wp->w_height may be end up too big. That's a problem
+	     * elsewhere, but prevent a crash here. */
+	    if (row > wp->w_height || row + wp->w_winrow >= Rows)
 	    {
 		/* we may need the size of that too long line later on */
 		if (dollar_vcol == -1)
diff --git a/src/version.c b/src/version.c
index f66e29255..b49c7643c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1228,
 /**/
     1227,
 /**/