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

Merge "Prevent user-defined basename_r from breaking basename(3)."

Browse Source
This commit is contained in:
Elliott Hughes 2015-07-11 07:03:53 +00:00 committed by Gerrit Code Review
commit 147a50d06e
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libc/bionic/libgen.cpp
View File

@ -39,7 +39,7 @@
static ThreadLocalBuffer<char, MAXPATHLEN> g_basename_tls_buffer; static ThreadLocalBuffer<char, MAXPATHLEN> g_basename_tls_buffer;
static ThreadLocalBuffer<char, MAXPATHLEN> g_dirname_tls_buffer; static ThreadLocalBuffer<char, MAXPATHLEN> g_dirname_tls_buffer;
__LIBC64_HIDDEN__ int basename_r(const char* path, char* buffer, size_t buffer_size) { static int __basename_r(const char* path, char* buffer, size_t buffer_size) {
const char* startp = NULL; const char* startp = NULL;
const char* endp = NULL; const char* endp = NULL;
int len; int len;
@ -91,7 +91,12 @@ __LIBC64_HIDDEN__ int basename_r(const char* path, char* buffer, size_t buffer_s
return result; return result;
} }
__LIBC64_HIDDEN__ int dirname_r(const char* path, char* buffer, size_t buffer_size) { // Since this is a non-standard symbol, it might be hijacked by a basename_r in the executable.
__LIBC64_HIDDEN__ int basename_r(const char* path, char* buffer, size_t buffer_size) {
return __basename_r(path, buffer, buffer_size);
}
static int __dirname_r(const char* path, char* buffer, size_t buffer_size) {
const char* endp = NULL; const char* endp = NULL;
int len; int len;
int result; int result;
@ -150,14 +155,19 @@ __LIBC64_HIDDEN__ int dirname_r(const char* path, char* buffer, size_t buffer_si
return result; return result;
} }
// Since this is a non-standard symbol, it might be hijacked by a basename_r in the executable.
__LIBC64_HIDDEN__ int dirname_r(const char* path, char* buffer, size_t buffer_size) {
return __dirname_r(path, buffer, buffer_size);
}
char* basename(const char* path) { char* basename(const char* path) {
char* buf = g_basename_tls_buffer.get(); char* buf = g_basename_tls_buffer.get();
int rc = basename_r(path, buf, g_basename_tls_buffer.size()); int rc = __basename_r(path, buf, g_basename_tls_buffer.size());
return (rc < 0) ? NULL : buf; return (rc < 0) ? NULL : buf;
} }
char* dirname(const char* path) { char* dirname(const char* path) {
char* buf = g_dirname_tls_buffer.get(); char* buf = g_dirname_tls_buffer.get();
int rc = dirname_r(path, buf, g_dirname_tls_buffer.size()); int rc = __dirname_r(path, buf, g_dirname_tls_buffer.size());
return (rc < 0) ? NULL : buf; return (rc < 0) ? NULL : buf;
} }