patch 7.4.820

Problem:    Invalid memory access in file_pat_to_reg_pat.
Solution:   Avoid looking before the start of a string. (Dominique Pelle)

diff --git a/src/fileio.c b/src/fileio.c
index 973e8ca0e80ee3a21dcece0a1537d9a0a979fef0..0f3f148b9bc657d762a056d2d4f811477a8722ad 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -10210,7 +10210,7 @@ file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
     else
        reg_pat[i++] = '^';
     endp = pat_end - 1;
-    if (*endp == '*')
+    if (endp >= pat && *endp == '*')
     {
        while (endp - pat > 0 && *endp == '*')
            endp--;

diff --git a/src/version.c b/src/version.c
index e3b885ed333da04480acc62f440ddd851831df54..f8ef512dd3c5b6cac0b29bf6e3d8b6529e4ee396 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    820,
 /**/
     819,
 /**/