ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chars: properly compare strings of different lengths 

That is: don't run towlower() on the two differing bytes when having
reached the end of one of the strings.

This fixes https://savannah.gnu.org/bugs/?48700.

In the bargain, don't do the conversion to lowercase twice.

Furthermore, persist when encountering invalid byte sequences --
until finding bytes that differ.
master
Benno Schulenberg 2016-07-27 22:15:34 +02:00
parent b305911cba
commit d80109dd5e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/chars.c
View File

@ -514,28 +514,37 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
while (*s1 != '\0' && *s2 != '\0' && n > 0) { while (*s1 != '\0' && *s2 != '\0' && n > 0) {
bool bad1 = FALSE, bad2 = FALSE; bool bad1 = FALSE, bad2 = FALSE;
int difference;
if (mbtowc(&wc1, s1, MB_CUR_MAX) < 0) { if (mbtowc(&wc1, s1, MB_CUR_MAX) < 0) {
mbtowc_reset(); mbtowc_reset();
wc1 = (unsigned char)*s1;
bad1 = TRUE; bad1 = TRUE;
} }
if (mbtowc(&wc2, s2, MB_CUR_MAX) < 0) { if (mbtowc(&wc2, s2, MB_CUR_MAX) < 0) {
mbtowc_reset(); mbtowc_reset();
wc2 = (unsigned char)*s2;
bad2 = TRUE; bad2 = TRUE;
} }
if (bad1 != bad2 || towlower(wc1) != towlower(wc2)) if (bad1 || bad2) {
break; if (*s1 != *s2)
return (unsigned char)*s1 - (unsigned char)*s2;
s1++; s2++; n--;
continue;
}
difference = towlower(wc1) - towlower(wc2);
if (difference != 0)
return difference;
s1 += move_mbright(s1, 0); s1 += move_mbright(s1, 0);
s2 += move_mbright(s2, 0); s2 += move_mbright(s2, 0);
n--; n--;
} }
return (n > 0) ? towlower(wc1) - towlower(wc2) : 0; return (n > 0) ? ((unsigned char)*s1 - (unsigned char)*s2) : 0;
} else } else
#endif #endif
return strncasecmp(s1, s2, n); return strncasecmp(s1, s2, n);