[PATCH] Fix lookup of collation sequence value during regexp matching

Andreas Schwab schwab@redhat.com
Wed May 5 08:27:00 GMT 2010


2010-05-04  Andreas Schwab  <schwab@redhat.com>

	* posix/regexec.c (find_collation_sequence_value): Fix skipping
	the wide char sequence of the collating element.
---
 posix/regexec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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);
-- 
1.7.0.1

-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."



More information about the Libc-hacker mailing list