aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.835

Browse Source 
Problem:    Comparing utf-8 sequences does not handle different byte sizes
            correctly.
Solution:   Get the byte size of each character. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2015-08-25 16:31:40 +02:00
parent 7e47d1ac6a
commit f6470c288c
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/misc2.c
View File

@@ -5058,7 +5058,7 @@ ff_wc_equal(s1, s2)
char_u *s1; char_u *s1;
char_u *s2; char_u *s2;
{ {
int i; int i, j;
int prev1 = NUL; int prev1 = NUL;
int prev2 = NUL; int prev2 = NUL;
@@ -5068,19 +5068,19 @@ ff_wc_equal(s1, s2)
if (s1 == NULL || s2 == NULL) if (s1 == NULL || s2 == NULL)
return FALSE; return FALSE;
if (STRLEN(s1) != STRLEN(s2)) for (i = 0, j = 0; s1[i] != NUL;)
return FAIL;
for (i = 0; s1[i] != NUL && s2[i] != NUL; i += MB_PTR2LEN(s1 + i))
{ {
int c1 = PTR2CHAR(s1 + i); int c1 = PTR2CHAR(s1 + i);
int c2 = PTR2CHAR(s2 + i); int 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 FAIL;
prev2 = prev1; prev2 = prev1;
prev1 = c1; prev1 = c1;
i += MB_PTR2LEN(s1 + i);
j += MB_PTR2LEN(s2 + j);
} }
return TRUE; return TRUE;
} }
@@ -5814,14 +5814,14 @@ pathcmp(p, q, maxlen)
const char *p, *q; const char *p, *q;
int maxlen; int maxlen;
{ {
int i; int i, j;
int c1, c2; int c1, c2;
const char *s = NULL; const char *s = NULL;
for (i = 0; maxlen < 0 || i < maxlen; i += MB_PTR2LEN((char_u *)p + i)) for (i = 0, j = 0; maxlen < 0 || (i < maxlen && j < maxlen);)
{ {
c1 = PTR2CHAR((char_u *)p + i); c1 = PTR2CHAR((char_u *)p + i);
c2 = PTR2CHAR((char_u *)q + i); c2 = PTR2CHAR((char_u *)q + j);
/* End of "p": check if "q" also ends or just has a slash. */ /* End of "p": check if "q" also ends or just has a slash. */
if (c1 == NUL) if (c1 == NUL)
@@ -5829,6 +5829,7 @@ pathcmp(p, q, maxlen)
if (c2 == NUL) /* full match */ if (c2 == NUL) /* full match */
return 0; return 0;
s = q; s = q;
i = j;
break; break;
} }
@@ -5854,8 +5855,11 @@ pathcmp(p, q, maxlen)
return p_fic ? MB_TOUPPER(c1) - MB_TOUPPER(c2) return p_fic ? MB_TOUPPER(c1) - MB_TOUPPER(c2)
: c1 - c2; /* no match */ : c1 - c2; /* no match */
} }
i += MB_PTR2LEN((char_u *)p + i);
j += MB_PTR2LEN((char_u *)q + j);
} }
if (s == NULL) /* "i" ran into "maxlen" */ if (s == NULL) /* "i" or "j" ran into "maxlen" */
return 0; return 0;
c1 = PTR2CHAR((char_u *)s + i); c1 = PTR2CHAR((char_u *)s + i);

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 */
/**/
835,
/**/ /**/
834, 834,
/**/ /**/