From f55727ca53308a206cf00d0442f8c57c73761899 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 31 Aug 2000 02:27:07 +0000 Subject: Update. * sysdeps/generic/ldsodefs.h: Add declaration for _dl_all_dirs and _dl_all_init_dirs. * include/link.h (struct r_search_path_struct): New. (struct link_map): Use it for l_rpath_dirs and l_runpath_dirs. * elf/Versions [ld] (GLIBC_2.2): Add _dl_all_dirs and _dl_all_init_dirs. * elf/dl-close.c (_dl_close): Free l_rpath_dirs and l_runpath_dirs. * elf/dl-libc.c (free_mem): Free _dl_all_dirs list except elements added at startup time. * elf/dl-load.c: Fix memory handling. r_search_path_struct contains element to remember fact that we can free memory. (all_dirs): Renamed to _dl_all_dirs. Made global. (_dl_init_all_dirs): New variable. (fillin_rpath): Save one malloc call. (decompose_rpath): Change interface. New first parameter points to r_search_path_struct. (_dl_init_paths): Adjust for changes. Mark all memory as not deletable. Set _dl_init_all_paths value. (open_path): Remove may_free_dirs parameter. r_search_path_elem *** parameter replaced with r_search_path_struct *. Information about freeing now contained in r_search_path_struct. (_dl_map_object): Adjust for above changes. * elf/dl-open.c (dl_open_worker): Change format of debug info a bit. --- elf/dl-libc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'elf/dl-libc.c') diff --git a/elf/dl-libc.c b/elf/dl-libc.c index 7d2b3608b2..dc47851803 100644 --- a/elf/dl-libc.c +++ b/elf/dl-libc.c @@ -126,6 +126,16 @@ static void free_mem (void) { struct link_map *l; + struct r_search_path_elem *d; + + /* Remove all search directories. */ + d = _dl_all_dirs; + while (d != _dl_init_all_dirs) + { + struct r_search_path_elem *old = d; + d = d->next; + free (old); + } /* Remove all additional names added to the objects. */ for (l = _dl_loaded; l != NULL; l = l->l_next) -- cgit v1.2.3