From: Roland McGrath Date: Tue, 22 Oct 2002 15:50:12 +0000 (+0000) Subject: * locale/programs/locarchive.c (enlarge_archive): Make sure X-Git-Tag: cvs/initial~183 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5e922099c61712176c8bd37f150ebe568c2a2476;p=glibc.git * locale/programs/locarchive.c (enlarge_archive): Make sure string_size is always a multiple of 4. Reported by Andreas Schwab . --- diff --git a/ChangeLog b/ChangeLog index e712c98608..d5a1d2fafc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-10-22 Jakub Jelinek + + * locale/programs/locarchive.c (enlarge_archive): Make sure + string_size is always a multiple of 4. + Reported by Andreas Schwab . + 2002-10-21 Roland McGrath * sysdeps/generic/libc-tls.c (__libc_setup_tls): Initialize the static diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index c7aa5b06ac..abb6cd28e1 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -272,7 +272,10 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) newhead.string_offset = (newhead.namehash_offset + (newhead.namehash_size * sizeof (struct namehashent))); - newhead.string_size = MAX (2 * newhead.string_used, newhead.string_size); + /* Keep the string table size aligned to 4 bytes, so that + all the struct { uint32_t } types following are happy. */ + newhead.string_size = MAX ((2 * newhead.string_used + 3) & -4, + newhead.string_size); newhead.locrectab_offset = newhead.string_offset + newhead.string_size; newhead.locrectab_size = MAX (2 * newhead.locrectab_used,