d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix initlist_add_object invocation parameters.

Browse Source 
The tail parameter should point to the last object for
which dependencies should be processed. In most cases,
this is the object itself.
This commit is contained in:
kan 2016-01-20 23:26:35 +00:00
parent 75cd33d704
commit 2f0f7ecf9c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libexec/rtld-elf/rtld.c
View File

@ -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