From 2bc9cabc544597791089f579a5a6d025792f47dc Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 25 Nov 2009 11:41:09 +0100 Subject: [PATCH] regex: Fix fastmap for multibyte character ranges. * lib/regcomp.c (re_compute_fastmap_iter): Add all multibyte lead characters when a multibyte character range is included. --- ChangeLog | 6 ++++++ lib/regcomp.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fcdf30723..54c551429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-25 Paolo Bonzini + + regex: Fix fastmap for multibyte character ranges. + * lib/regcomp.c (re_compute_fastmap_iter): Add all multibyte lead + characters when a multibyte character range is included. + 2009-11-22 Andy Wingo version-etc: work also with AM_INIT_AUTOMAKE's no-define option diff --git a/lib/regcomp.c b/lib/regcomp.c index 6472ff6b2..6aef4050b 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -383,7 +383,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, applies to multibyte character sets; for single byte character sets, the SIMPLE_BRACKET again suffices. */ if (dfa->mb_cur_max > 1 - && (cset->nchar_classes || cset->non_match + && (cset->nchar_classes || cset->non_match || cset->nranges # ifdef _LIBC || cset->nequiv_classes # endif /* _LIBC */ -- 2.11.0