From d43f0951bca162d4491d57df9277b5dbc462944f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 27 Aug 2015 22:30:47 +0200 Subject: 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) --- src/misc2.c | 12 +++++++----- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/misc2.c b/src/misc2.c index a4a65d6aa6..379916b393 100644 --- 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 37df414e78..215e03b987 100644 --- 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, /**/ -- cgit v1.2.3