OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* posix/regcomp.c (lookup_collation_sequence_value): check that

Browse Source 
nrules != 0 for multibyte chars.
This commit is contained in:
Ulrich Drepper 2007-09-24 03:31:47 +00:00
parent a6a0334521
commit a532a41df5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-09-13 Aurelien Jarno <aurelien@aurel32.net>
* posix/regcomp.c (lookup_collation_sequence_value): check that
nrules != 0 for multibyte chars.
2007-09-23 Ulrich Drepper <drepper@redhat.com> 2007-09-23 Ulrich Drepper <drepper@redhat.com>
* resolv/ns_print.c (ns_sprintrrf): Handle ns_t_a6 and ns_t_opt. * resolv/ns_print.c (ns_sprintrrf): Handle ns_t_a6 and ns_t_opt.

3
posix/regcomp.c
View File

@ -2747,7 +2747,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
return elem; return elem;
} }
/* Local function for parse_bracket_exp used in _LIBC environement. /* Local function for parse_bracket_exp used in _LIBC environment.
Look up the collation sequence value of BR_ELEM. Look up the collation sequence value of BR_ELEM.
Return the value if succeeded, UINT_MAX otherwise. */ Return the value if succeeded, UINT_MAX otherwise. */
@ -2771,6 +2771,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
} }
else if (br_elem->type == MB_CHAR) else if (br_elem->type == MB_CHAR)
{ {
if (nrules != 0)
return __collseq_table_lookup (collseqwc, br_elem->opr.wch); return __collseq_table_lookup (collseqwc, br_elem->opr.wch);
} }
else if (br_elem->type == COLL_SYM) else if (br_elem->type == COLL_SYM)