2002-10-22 Jakub Jelinek <jakub@redhat.com>
authorroland <roland>
Tue, 22 Oct 2002 15:50:06 +0000 (15:50 +0000)
committerroland <roland>
Tue, 22 Oct 2002 15:50:06 +0000 (15:50 +0000)
* locale/programs/locarchive.c (enlarge_archive): Make sure
string_size is always a multiple of 4.
Reported by Andreas Schwab <schwab@suse.de>.

locale/programs/locarchive.c

index c7aa5b0..abb6cd2 100644 (file)
@@ -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,