GNU C Library master sources branch, master, updated. glibc-2.12-8-gd84acf3

drepper@sourceware.org drepper@sourceware.org
Wed May 5 16:59:00 GMT 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  d84acf388ed8b3f162dda0512139095bfc268beb (commit)
      from  5d05c55424406c947618d60f06fc0d119a4f0e54 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d84acf388ed8b3f162dda0512139095bfc268beb

commit d84acf388ed8b3f162dda0512139095bfc268beb
Author: Andreas Schwab <schwab@redhat.com>
Date:   Wed May 5 09:59:25 2010 -0700

    Fix lookup of collation sequence value during regexp matching

diff --git a/ChangeLog b/ChangeLog
index e379606..b3d22b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-2010-05-05  Andreas Schwab  <schwab@redhat.com>
+2010-05-04  Andreas Schwab  <schwab@redhat.com>
 
-	* INSTALL: Regenerate.
+	* posix/regexec.c (find_collation_sequence_value): Fix skipping
+	the wide char sequence of the collating element.
 
 2010-05-05  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/posix/regexec.c b/posix/regexec.c
index f877016..7f7ae31 100644
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -4031,7 +4031,7 @@ find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
 	  /* Skip the collation sequence value.  */
 	  idx += sizeof (uint32_t);
 	  /* Skip the wide char sequence of the collating element.  */
-	  idx = idx + sizeof (uint32_t) * (extra[idx] + 1);
+	  idx = idx + sizeof (uint32_t) * (*(int32_t *) (extra + idx) + 1);
 	  /* If we found the entry, return the sequence value.  */
 	  if (found)
 	    return *(uint32_t *) (extra + idx);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    5 +++--
 posix/regexec.c |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list