OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* locale/programs/locarchive.c (enlarge_archive): Make sure

Browse Source 
string_size is always a multiple of 4.
	Reported by Andreas Schwab <schwab@suse.de>.
This commit is contained in:
Roland McGrath 2002-10-22 15:50:12 +00:00
parent 8265947da0
commit 5e922099c6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-10-22 Jakub Jelinek <jakub@redhat.com>
* locale/programs/locarchive.c (enlarge_archive): Make sure
string_size is always a multiple of 4.
Reported by Andreas Schwab <schwab@suse.de>.
2002-10-21 Roland McGrath <roland@redhat.com>
* sysdeps/generic/libc-tls.c (__libc_setup_tls): Initialize the static

5
locale/programs/locarchive.c
View 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,