regex: fix glibc bug 697

2009-01-09  Paolo Bonzini  <bonzini@gnu.org>

	* lib/regexec.c (prune_impossible_nodes): Handle sifted_states[0]
	being NULL also if there are no backreferences.

diff --git a/ChangeLog b/ChangeLog
index 2059b03..fe1f703 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-01-09  Paolo Bonzini  <bonzini@gnu.org>
 
+       regex: fix glibc bug 697
+       * lib/regexec.c (prune_impossible_nodes): Handle sifted_states[0]
+       being NULL also if there are no backreferences.
+
+2009-01-09  Paolo Bonzini  <bonzini@gnu.org>
+
        regex: merge glibc changes
        * lib/regcomp.c (re_compile_fastmap_iter): Use __mbrtowc.
        * lib/regex_internal.c (build_wcs_buffer, build_wcs_upper_buffer,

diff --git a/lib/regexec.c b/lib/regexec.c
index 2afa5b3..21a8166 100644 (file)
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -1,6 +1,6 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -1045,6 +1045,11 @@ prune_impossible_nodes (re_match_context_t *mctx)
       re_node_set_free (&sctx.limits);
       if (BE (ret != REG_NOERROR, 0))
        goto free_return;
+      if (sifted_states[0] == NULL)
+       {
+         ret = REG_NOMATCH;
+         goto free_return;
+       }
     }
   re_free (mctx->state_log);
   mctx->state_log = sifted_states;