libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: regex: fix faulty check for valid range expression 

Except for the "C" or "POSIX" locale, checking for start <= finish
is always wrong.  Range start must be <= range finish in terms of the
locale's collating order.  So make sure to call always wcscoll(), even
in the "C"/"POSIX" locale, which makes wcscoll equivalent to wcscmp
anyway.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2023-03-16 21:09:53 +01:00
parent e914374383
commit 5924191333
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/regex/regcomp.c
View File

@ -1145,7 +1145,7 @@ p_b_term(struct parse *p, cset *cs)
#else #else
if (MB_CUR_MAX > 1) { if (MB_CUR_MAX > 1) {
#endif #endif
(void)REQUIRE(start <= finish, REG_ERANGE); (void)REQUIRE(p_range_cmp(start, finish) <= 0, REG_ERANGE);
CHaddrange(p, cs, start, finish); CHaddrange(p, cs, start, finish);
} else { } else {
(void)REQUIRE(p_range_cmp(start, finish) <= 0, REG_ERANGE); (void)REQUIRE(p_range_cmp(start, finish) <= 0, REG_ERANGE);
@ -1665,8 +1665,6 @@ CHaddrange(struct parse *p, cset *cs, wint_t min, wint_t max)
for (; min < NC && min <= max; min++) for (; min < NC && min <= max; min++)
CHadd(p, cs, min); CHadd(p, cs, min);
if (min >= max)
return;
newranges = reallocarray(cs->ranges, cs->nranges + 1, newranges = reallocarray(cs->ranges, cs->nranges + 1,
sizeof(*cs->ranges)); sizeof(*cs->ranges));
if (newranges == NULL) { if (newranges == NULL) {