aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-04-24 18:20:10 +0000
committerUlrich Drepper <drepper@redhat.com>2009-04-24 18:20:10 +0000
commitc2d5bd5b00cfbb0ef192821f2d724fb6448d59e3 (patch)
tree61e1ed7ad4b5c220917d91bae2a8aa38a037b4c2 /locale
parentf397be127c20a04c55a0545c0950dcb8acd03eaa (diff)
downloadglibc-c2d5bd5b00cfbb0ef192821f2d724fb6448d59e3.zip
glibc-c2d5bd5b00cfbb0ef192821f2d724fb6448d59e3.tar.gz
glibc-c2d5bd5b00cfbb0ef192821f2d724fb6448d59e3.tar.bz2
[BZ #10100]
2009-04-24 Ulrich Drepper <drepper@redhat.com> [BZ #10100] * misc/hsearch_r.c (hsearch_r): Add back ensurance that hval is not zero.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/locarchive.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 02f89de..66c5d39 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -131,14 +131,12 @@ create_archive (const char *archivefname, struct locarhandle *ah)
/* To prepare for enlargements of the mmaped area reserve some
address space. */
- size_t reserved;
+ size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0;
- p = mmap64 (NULL, RESERVE_MMAP_SIZE, PROT_NONE, MAP_ANON, -1, 0);
- if (p != MAP_FAILED)
- {
- xflags = MAP_FIXED;
- reserved = RESERVE_MMAP_SIZE;
- }
+ if (total < RESERVE_MMAP_SIZE
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_ANON, -1, 0))
+ != MAP_FAILED))
+ xflags = MAP_FIXED;
else
{
p = NULL;
@@ -580,14 +578,13 @@ open_archive (struct locarhandle *ah, bool readonly)
/* To prepare for enlargements of the mmaped area reserve some
address space. */
- size_t reserved;
+ size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0;
- void *p = mmap64 (NULL, RESERVE_MMAP_SIZE, PROT_NONE, MAP_ANON, -1, 0);
- if (p != MAP_FAILED)
- {
- xflags = MAP_FIXED;
- reserved = RESERVE_MMAP_SIZE;
- }
+ void *p;
+ if (st.st_size < RESERVE_MMAP_SIZE
+ && ((p = mmap64 (NULL, RESERVE_MMAP_SIZE, PROT_NONE, MAP_ANON, -1, 0))
+ != MAP_FAILED))
+ xflags = MAP_FIXED;
else
{
p = NULL;
@@ -612,7 +609,7 @@ close_archive (struct locarhandle *ah)
{
if (ah->fd != -1)
{
- munmap (ah->addr, ah->mmaped);
+ munmap (ah->addr, MAX (ah->reserved, ah->mmaped));
close (ah->fd);
}
}