diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-09-16 16:51:20 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-09-16 16:51:20 +0200 |
| commit | 8321c10fda56307b0337eb923908a7232155678b (patch) | |
| tree | 4c9d837580cfd993a1c7cc853db975d1ebbacf99 /posix | |
| parent | b9f90badf4c5d700509aa6b457a5d718ac19da18 (diff) | |
| parent | 12a8f182f36ff959139e761e9160ce2f8b488520 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
sysdeps/mach/hurd/ttyname_r.c
Diffstat (limited to 'posix')
| -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 f87701672b..7f7ae3123f 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); |