* config/srclist.txt: Add glibc bug 1227.

* lib/regexec.c (sift_states_bkref): Fix portability bug: the code
assumed that reg_errcode_t is a signed type, which is not
necessarily true if _XOPEN_SOURCE is not defined.

diff --git a/config/ChangeLog b/config/ChangeLog
index 725cda7e6da6f3b0316ddc12053a5caf46755824..8d48dd2c74ccd8402b7a78e328c5af1fb927c36a 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,6 @@
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * srclist.txt: Add glibc bugs 1220, 1221, 1222, 1223, 1224, 1225, 1226.
+       * srclist.txt: Add glibc bugs 1220-1227.
 
 2005-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/config/srclist.txt b/config/srclist.txt
index 779ba1f6f1753a18178e7b181821e18b7e008bf0..438e126d4b8e57a5aef0cb9df1b44df62ad22652 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.77 2005-08-21 03:31:46 eggert Exp $
+# $Id: srclist.txt,v 1.78 2005-08-21 05:01:20 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -121,6 +121,7 @@ $LIBCSRC/posix/regex.c                      lib gpl
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1216
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1220
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1225
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1227
 #$LIBCSRC/posix/regexec.c              lib gpl
 #
 # c89 changes $LIBCSRC/string/strdup.c         lib gpl

diff --git a/lib/ChangeLog b/lib/ChangeLog
index c50e56da00e241a7d5af790fe723a13263e1d6c2..d0a87cf3a5f114a8e4bdbb530bfe307d09f48e12 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 
+       Fix problems reported by Sam Steingold in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2005-08/msg00007.html>.
+       * regexec.c (sift_states_bkref): Fix portability bug: the code
+       assumed that reg_errcode_t is a signed type, which is not
+       necessarily true if _XOPEN_SOURCE is not defined.
        * regex_internal.c (calc_state_hash): Put 'inline' before type, since
        some compilers warn about it otherwise.
 

diff --git a/lib/regexec.c b/lib/regexec.c
index 6ca15bb547412993d56d345c223786efa5300510..4f6c50c898fff413298a7fc8eafdd6ec1a8c4637 100644 (file)
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -2088,7 +2088,7 @@ sift_states_bkref (re_match_context_t *mctx, re_sift_context_t *sctx,
       enabled_idx = first_idx;
       do
        {
-         int subexp_len, to_idx, dst_node;
+         int subexp_len, to_idx, dst_node, ret;
          re_dfastate_t *cur_state;
 
          if (entry->node != node)
@@ -2114,8 +2114,8 @@ sift_states_bkref (re_match_context_t *mctx, re_sift_context_t *sctx,
            }
          local_sctx.last_node = node;
          local_sctx.last_str_idx = str_idx;
-         err = re_node_set_insert (&local_sctx.limits, enabled_idx);
-         if (BE (err < 0, 0))
+         ret = re_node_set_insert (&local_sctx.limits, enabled_idx);
+         if (BE (ret < 0, 0))
            {
              err = REG_ESPACE;
              goto free_return;