Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change _rtld_dlclose() to unload the object via _rtld_unload_object() rather

Browse Source 
than by itself.  Besides being duplicated code the open-coded version
also did not take care of cleaning up after the object's DAG(!).
Fixes PR bin/8905.
This commit is contained in:
kleink 2000-02-07 19:02:49 +00:00
parent cf02e1f1ce
commit 65b8f3b2eb
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libexec/ld.elf_so/rtld.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtld.c,v 1.28 1999/12/13 09:09:34 christos Exp $ */
/* $NetBSD: rtld.c,v 1.29 2000/02/07 19:02:49 kleink Exp $ */
/*
* Copyright 1996 John D. Polstra.
@ -600,36 +600,8 @@ _rtld_dlclose(handle)
_rtld_debug_state();
--root->dl_refcount;
_rtld_unref_dag(root);
if (root->refcount == 0) { /* We are finished with some objects. */
Obj_Entry *obj;
Obj_Entry **linkp;
_rtld_unload_object(root, true);
/* Finalize objects that are about to be unmapped. */
for (obj = _rtld_objlist->next; obj != NULL; obj = obj->next)
if (obj->refcount == 0 && obj->fini != NULL)
(*obj->fini) ();
/* Unmap all objects that are no longer referenced. */
linkp = &_rtld_objlist->next;
while ((obj = *linkp) != NULL) {
if (obj->refcount == 0) {
munmap(obj->mapbase, obj->mapsize);
free(obj->path);
while (obj->needed != NULL) {
Needed_Entry *needed = obj->needed;
obj->needed = needed->next;
free(needed);
}
_rtld_linkmap_delete(obj);
*linkp = obj->next;
if (obj->next == NULL)
_rtld_objtail = linkp;
free(obj);
} else
linkp = &obj->next;
}
}
_rtld_debug.r_state = RT_CONSISTENT;
_rtld_debug_state();