From: Andreas Schwab <schwab@redhat.com>
Date: Wed, 5 May 2010 16:59:25 +0000 (-0700)
Subject: Fix lookup of collation sequence value during regexp matching
X-Git-Tag: fedora/glibc-2.12.90-1~1^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d84acf388ed8b3f162dda0512139095bfc268beb;p=thirdparty%2Fglibc.git

Fix lookup of collation sequence value during regexp matching
---

diff --git a/ChangeLog b/ChangeLog
index e3796063457..b3d22b851e5 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 f87701672b1..7f7ae3123fa 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);