summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kabaev <kan@FreeBSD.org>2016-01-20 23:26:35 +0000
committerAlexander Kabaev <kan@FreeBSD.org>2016-01-20 23:26:35 +0000
commit832b9473057a675a90b4b1e7929ef3c5b82904f6 (patch)
tree2b299c0f951d2019e6e2c53086652ca32b97cef1
parent0b0dd5086b303617f0f17d3d6f83659a7a74e074 (diff)
Notes
-rw-r--r--libexec/rtld-elf/rtld.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 06690ff22b1e1..863fe25f619a8 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -2016,7 +2016,7 @@ initlist_add_neededs(Needed_Entry *needed, Objlist *list)
/* Process the current needed object. */
if (needed->obj != NULL)
- initlist_add_objects(needed->obj, globallist_next(needed->obj), list);
+ initlist_add_objects(needed->obj, needed->obj, list);
}
/*
@@ -2039,7 +2039,7 @@ initlist_add_objects(Obj_Entry *obj, Obj_Entry *tail, Objlist *list)
/* Recursively process the successor objects. */
nobj = globallist_next(obj);
- if (nobj != NULL && nobj != tail)
+ if (nobj != NULL && obj != tail)
initlist_add_objects(nobj, tail, list);
/* Recursively process the needed objects. */
@@ -3140,7 +3140,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags,
*/
} else {
/* Make list of init functions to call. */
- initlist_add_objects(obj, globallist_next(obj), &initlist);
+ initlist_add_objects(obj, obj, &initlist);
}
/*
* Process all no_delete or global objects here, given