diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-05-14 11:15:22 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-05-14 13:13:53 +0200 |
| commit | e9691db5366a2990ccebf157c757ae60258b46d6 (patch) | |
| tree | f17aa7f144b1acde14902700a13f95055bab6c70 /posix/regexec.c | |
| parent | 5e6e747fa224df1159f7eb32bc26d44cad0dbb17 (diff) | |
| parent | 6d270188ef3fe10125b8723ed69ebdc9e90e914e (diff) | |
| download | glibc-e9691db5366a2990ccebf157c757ae60258b46d6.tar.gz glibc-e9691db5366a2990ccebf157c757ae60258b46d6.tar.xz glibc-e9691db5366a2990ccebf157c757ae60258b46d6.zip | |
Merge remote branch 'origin/release/2.11/master' into fedora/2.11/master
Diffstat (limited to 'posix/regexec.c')
| -rw-r--r-- | posix/regexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/posix/regexec.c b/posix/regexec.c index 7bf0c08a78..8481b618da 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -3998,7 +3998,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); |