aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

patch 7.4.843

Browse Source 
Problem:    Still possible to go beyond the end of a string.
Solution:   Check for NUL also in second string. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar 2015-08-27 22:30:47 +02:00
parent cdf0442d00
commit d43f0951bc
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/misc2.c
View File

@ -5059,6 +5059,8 @@ ff_wc_equal(s1, s2)
char_u *s2; char_u *s2;
{ {
int i, j; int i, j;
int c1 = NUL;
int c2 = NUL;
int prev1 = NUL; int prev1 = NUL;
int prev2 = NUL; int prev2 = NUL;
@ -5068,21 +5070,21 @@ ff_wc_equal(s1, s2)
if (s1 == NULL || s2 == NULL) if (s1 == NULL || s2 == NULL)
return FALSE; 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); c1 = PTR2CHAR(s1 + i);
int c2 = PTR2CHAR(s2 + j); c2 = PTR2CHAR(s2 + j);
if ((p_fic ? MB_TOLOWER(c1) != MB_TOLOWER(c2) : c1 != c2) if ((p_fic ? MB_TOLOWER(c1) != MB_TOLOWER(c2) : c1 != c2)
&& (prev1 != '*' || prev2 != '*')) && (prev1 != '*' || prev2 != '*'))
return FAIL; return FALSE;
prev2 = prev1; prev2 = prev1;
prev1 = c1; prev1 = c1;
i += MB_PTR2LEN(s1 + i); i += MB_PTR2LEN(s1 + i);
j += MB_PTR2LEN(s2 + j); j += MB_PTR2LEN(s2 + j);
} }
return TRUE; return c1 == c2;
} }
#endif #endif

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
843,
/**/ /**/
842, 842,
/**/ /**/