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.

diff --git a/ChangeLog b/ChangeLog
index fcdf307237217bbe3aaaba20a451c4f2d891a8df..54c5514295f48eba902f0451987c6995c905f920 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-25  Paolo Bonzini  <bonzini@gnu.org>
+
+       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  <wingo@pobox.com>
 
        version-etc: work also with AM_INIT_AUTOMAKE's no-define option

diff --git a/lib/regcomp.c b/lib/regcomp.c
index 6472ff6b2eb0d1b7707ddce159c58bd9da81d3fc..6aef4050b3fd66493d84364dba3a3a3a43b71cd6 100644 (file)
--- 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 */