generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make LD_PRELOAD failures just warnings.

Browse Source 
This matches glibc and makes life easier for developers who want to
sometimes preload a library from init (which has no conditionals); they
can simply move/remove the library to disable.

Change-Id: I579b8633f958235af6e46bb53b378b9e363afb1f
This commit is contained in:
Elliott Hughes
2013-06-18 13:15:00 -07:00
parent 977a33137d
commit 7e5a8cc523
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
linker/linker.cpp
View File

@@ -1492,18 +1492,19 @@ static bool soinfo_link_image(soinfo* si) {
return false;
}
/* if this is the main executable, then load all of the preloads now */
// If this is the main executable, then load all of the libraries from LD_PRELOAD now.
if (si->flags & FLAG_EXE) {
memset(gLdPreloads, 0, sizeof(gLdPreloads));
size_t preload_count = 0;
for (size_t i = 0; gLdPreloadNames[i] != NULL; i++) {
soinfo* lsi = find_library(gLdPreloadNames[i]);
if (lsi == NULL) {
strlcpy(tmp_err_buf, linker_get_error_buffer(), sizeof(tmp_err_buf));
DL_ERR("could not load library \"%s\" needed by \"%s\"; caused by %s",
gLdPreloadNames[i], si->name, tmp_err_buf);
return false;
if (lsi != NULL) {
gLdPreloads[preload_count++] = lsi;
} else {
// As with glibc, failure to load an LD_PRELOAD library is just a warning.
DL_WARN("could not load library \"%s\" from LD_PRELOAD for \"%s\"; caused by %s",
gLdPreloadNames[i], si->name, linker_get_error_buffer());
}
gLdPreloads[i] = lsi;
}
}