patch 7.4.843

Problem:    Still possible to go beyond the end of a string.
Solution:   Check for NUL also in second string. (Dominique Pelle)

diff --git a/src/misc2.c b/src/misc2.c
index a4a65d6aa64a014f19e78fb4df2cc0343bb4f95e..379916b393f52ccd07ce8131b2b429c54bccbb14 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -5059,6 +5059,8 @@ ff_wc_equal(s1, s2)
     char_u     *s2;
 {
     int                i, j;
+    int                c1 = NUL;
+    int                c2 = NUL;
     int                prev1 = NUL;
     int                prev2 = NUL;
 
@@ -5068,21 +5070,21 @@ ff_wc_equal(s1, s2)
     if (s1 == NULL || s2 == NULL)
        return FALSE;
 
-    for (i = 0, j = 0; s1[i] != NUL;)
+    for (i = 0, j = 0; s1[i] != NUL && s2[j] != NUL;)
     {
-       int c1 = PTR2CHAR(s1 + i);
-       int c2 = PTR2CHAR(s2 + j);
+       c1 = PTR2CHAR(s1 + i);
+       c2 = PTR2CHAR(s2 + j);
 
        if ((p_fic ? MB_TOLOWER(c1) != MB_TOLOWER(c2) : c1 != c2)
                && (prev1 != '*' || prev2 != '*'))
-           return FAIL;
+           return FALSE;
        prev2 = prev1;
        prev1 = c1;
 
         i += MB_PTR2LEN(s1 + i);
         j += MB_PTR2LEN(s2 + j);
     }
-    return TRUE;
+    return c1 == c2;
 }
 #endif
 

diff --git a/src/version.c b/src/version.c
index 37df414e78eb2b1302b6136bcfd37f698a3e2b32..215e03b9871695f9eb005dc178ede7133b197d64 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 */
+/**/
+    843,
 /**/
     842,
 /**/