From f802accba41c85a2c122f7461282f8a1b5328379 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 14 Mar 1998 16:08:16 +0000 Subject: Update. 1998-03-14 11:47 H.J. Lu * elf/dl-close.c (_dl_close): Stop unmapping the segments after unmapping the last loaded segment. 1998-03-14 15:54 Ulrich Drepper * configure.in: Set base_os for Irix6. Correct test for .weakext. 1998-03-14 Andreas Jaeger * elf/dl-deps.c (_dl_map_object_deps): Add first parameter (new_line) to _dl_debug_message call. * locale/programs/linereader.c (lr_token): Return EOF token at EOF. --- elf/dl-close.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'elf/dl-close.c') diff --git a/elf/dl-close.c b/elf/dl-close.c index 285457323d..253b073367 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -80,6 +80,7 @@ _dl_close (struct link_map *map) /* That was the last reference, and this was a dlopen-loaded object. We can unmap it. */ const ElfW(Phdr) *ph; + const ElfW(Phdr) *eph; if (imap->l_info[DT_FINI]) /* Call its termination function. */ @@ -99,9 +100,14 @@ _dl_close (struct link_map *map) _dl_global_scope_end[1] = NULL; } + /* Find the first entry specifying a load command. We have + to determine this now since the table itself is also loaded. */ + for (eph = imap->l_phdr; eph < imap->l_phdr + imap->l_phnum; ++eph) + if (eph->p_type == PT_LOAD) + break; + /* Unmap the segments. */ - for (ph = imap->l_phdr + (imap->l_phnum - 1); - ph >= imap->l_phdr; --ph) + for (ph = imap->l_phdr + (imap->l_phnum - 1); ph >= eph; --ph) if (ph->p_type == PT_LOAD) { ElfW(Addr) mapstart = ph->p_vaddr & ~(ph->p_align - 1); -- cgit v1.2.3