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

Merge "Use local copy of the library name on dlopen"

Browse Source
This commit is contained in:
Dmitriy Ivanov 2014-10-31 22:47:24 +00:00 committed by Gerrit Code Review
commit 74c0ccd49b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
linker/linker.cpp
View File

@ -107,6 +107,8 @@ static const char* const kDefaultLdPaths[] = {
#define LDPRELOAD_BUFSIZE (LDPRELOAD_MAX*64)
#define LDPRELOAD_MAX 8
#define MAX_PATH_LEN 512
static char g_ld_library_paths_buffer[LDPATH_BUFSIZE];
static const char* g_ld_library_paths[LDPATH_MAX + 1];
@ -750,7 +752,7 @@ ElfW(Sym)* dladdr_find_symbol(soinfo* si, const void* addr) {
}
static int open_library_on_path(const char* name, const char* const paths[]) {
char buf[512];
char buf[MAX_PATH_LEN];
for (size_t i = 0; paths[i] != nullptr; ++i) {
int n = __libc_format_buffer(buf, sizeof(buf), "%s/%s", paths[i], name);
if (n < 0 || n >= static_cast<int>(sizeof(buf))) {
@ -1103,8 +1105,18 @@ soinfo* do_dlopen(const char* name, int flags, const android_dlextinfo* extinfo)
return nullptr;
}
}
size_t name_len = strlen(name);
if (name_len >= MAX_PATH_LEN) {
DL_ERR("library name \"%s\" is too long", name);
return nullptr;
}
char local_name[name_len+1];
strlcpy(local_name, name, name_len+1);
protect_data(PROT_READ | PROT_WRITE);
soinfo* si = find_library(name, flags, extinfo);
soinfo* si = find_library(local_name, flags, extinfo);
if (si != nullptr) {
si->CallConstructors();
}