svn commit: r240686 - head/libexec/rtld-elf
Konstantin Belousov
kib at FreeBSD.org
Wed Sep 19 05:11:26 UTC 2012
Author: kib
Date: Wed Sep 19 05:11:25 2012
New Revision: 240686
URL: http://svn.freebsd.org/changeset/base/240686
Log:
Do not reference z_nodeflib for !objgiven case, thus fixing LD_PRELOAD
for a non-absolute path.
PR: bin/171604
MFC after: 3 days
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c Wed Sep 19 00:27:50 2012 (r240685)
+++ head/libexec/rtld-elf/rtld.c Wed Sep 19 05:11:25 2012 (r240686)
@@ -1429,7 +1429,7 @@ find_library(const char *xname, const Ob
{
char *pathname;
char *name;
- bool objgiven;
+ bool nodeflib, objgiven;
objgiven = refobj != NULL;
if (strchr(xname, '/') != NULL) { /* Hard coded pathname */
@@ -1464,6 +1464,7 @@ find_library(const char *xname, const Ob
(pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL)
return (pathname);
} else {
+ nodeflib = objgiven ? refobj->z_nodeflib : false;
if ((objgiven &&
(pathname = search_library_path(name, refobj->rpath)) != NULL) ||
(objgiven && refobj->runpath == NULL && refobj != obj_main &&
@@ -1471,9 +1472,8 @@ find_library(const char *xname, const Ob
(pathname = search_library_path(name, ld_library_path)) != NULL ||
(objgiven &&
(pathname = search_library_path(name, refobj->runpath)) != NULL) ||
- (pathname = search_library_path(name, gethints(refobj->z_nodeflib)))
- != NULL ||
- (objgiven && !refobj->z_nodeflib &&
+ (pathname = search_library_path(name, gethints(nodeflib))) != NULL ||
+ (objgiven && !nodeflib &&
(pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL))
return (pathname);
}
More information about the svn-src-head
mailing list