Fix library lookup for filenames with slash.
If filename contains a slash, then it is interpreted as a (relative or absolute) pathname. Bug: https://code.google.com/p/android/issues/detail?id=6670 Change-Id: Iba57d638301f3089ad47ba083edca2dd36b801ed
This commit is contained in:
parent
c0eaa73284
commit
e44fffd7f9
@ -942,12 +942,8 @@ static int open_library(const char* name, off64_t* file_offset) {
|
|||||||
int fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CLOEXEC));
|
int fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CLOEXEC));
|
||||||
if (fd != -1) {
|
if (fd != -1) {
|
||||||
*file_offset = 0;
|
*file_offset = 0;
|
||||||
return fd;
|
|
||||||
}
|
}
|
||||||
// ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now.
|
return fd;
|
||||||
#if defined(__LP64__)
|
|
||||||
return -1;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Otherwise we try LD_LIBRARY_PATH first, and fall back to the built-in well known paths.
|
// Otherwise we try LD_LIBRARY_PATH first, and fall back to the built-in well known paths.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user