patch 8.2.2374: accessing uninitialized memory in test_undo

Problem:    Accessing uninitialized memory in test_undo.
Solution:   Do not look in typebuf.tb_buf if it is empty. (Dominique Pellé,
            closes #7697)

diff --git a/src/edit.c b/src/edit.c
index a152d84499a77f68a2df9b2b8926c85aa293e02f..35e4bc2c4bfcd943f500498d57286e76eafca6d2 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -1586,7 +1586,7 @@ decodeModifyOtherKeys(int c)
     // Recognize:
     // form 0: {lead}{key};{modifier}u
     // form 1: {lead}27;{modifier};{key}~
-    if ((c == CSI || (c == ESC && *p == '[')) && typebuf.tb_len >= 4)
+    if (typebuf.tb_len >= 4 && (c == CSI || (c == ESC && *p == '[')))
     {
        idx = (*p == '[');
        if (p[idx] == '2' && p[idx + 1] == '7' && p[idx + 2] == ';')

diff --git a/src/version.c b/src/version.c
index f1b728048a3e1ab47e74f298ef2f7c560bce2809..98f120b2e2490f8d52b9bbca7e9963386fd156ba 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2374,
 /**/
     2373,
 /**/