svn commit: r294470 - head/libexec/rtld-elf

[Alexander Kabaev]

Author: kan
Date: Wed Jan 20 23:26:35 2016
New Revision: 294470
URL: https://svnweb.freebsd.org/changeset/base/294470

Log:
  Fix initlist_add_object invocation parameters.
  
  The tail parameter should point to the last object for
  which dependencies should be processed. In most cases,
  this is the object itself.

Modified:
  head/libexec/rtld-elf/rtld.c

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Wed Jan 20 23:23:08 2016	(r294469)
+++ head/libexec/rtld-elf/rtld.c	Wed Jan 20 23:26:35 2016	(r294470)
@@ -2016,7 +2016,7 @@ initlist_add_neededs(Needed_Entry *neede
 
     /* 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
 
     /* 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, 
 		 */
 	    } 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