patch 8.2.5160: accessing invalid memory after changing terminal size

Problem:    Accessing invalid memory after changing terminal size.
Solution:   Adjust cmdline_row and msg_row to the value of Rows.

diff --git a/src/term.c b/src/term.c
index c1440d850f57a2476cf5175b0b2e14ef9aa2563a..b365831146d1749613d8503f6cee68ac9b8f9354 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -3366,6 +3366,12 @@ check_shellsize(void)
     if (Rows < min_rows())     // need room for one window and command line
        Rows = min_rows();
     limit_screen_size();
+
+    // make sure these values are not invalid
+    if (cmdline_row >= Rows)
+       cmdline_row = Rows - 1;
+    if (msg_row >= Rows)
+       msg_row = Rows - 1;
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index e0a9768de181bdeb38aa42edbff8b710065dfed1..acf84d1d2d426c4a6d10c56c4f99c03a4a3185e4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5160,
 /**/
     5159,
 /**/