patch 7.4.817

Problem:    Invalid memory access in file_pat_to_reg_pat().
Solution:   Use vim_isspace() instead of checking for a space only. (Dominique
            Pelle)

diff --git a/src/fileio.c b/src/fileio.c
index b1bcfb5363b627399aaeb13b9aa97da92c4cbee8..973e8ca0e80ee3a21dcece0a1537d9a0a979fef0 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -10188,7 +10188,7 @@ file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
 #endif
            default:
                size++;
-# ifdef  FEAT_MBYTE
+# ifdef FEAT_MBYTE
                if (enc_dbcs != 0 && (*mb_ptr2len)(p) > 1)
                {
                    ++p;
@@ -10277,7 +10277,7 @@ file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
                    reg_pat[i++] = '?';
                else
                    if (*p == ',' || *p == '%' || *p == '#'
-                                      || *p == ' ' || *p == '{' || *p == '}')
+                              || vim_isspace(*p) || *p == '{' || *p == '}')
                        reg_pat[i++] = *p;
                    else if (*p == '\\' && p[1] == '\\' && p[2] == '{')
                    {

diff --git a/src/version.c b/src/version.c
index e5f2b9482243543ef1a598c0a610b78b4ecae11e..177b59102362c10885855854ca98a6d71911abe9 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 */
+/**/
+    817,
 /**/
     816,
 /**/