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

Merge "Replace snprintf calls in linker." into lmp-dev

Browse Source
This commit is contained in:
Christopher Ferris 2014-08-27 22:42:11 +00:00 committed by Android (Google) Code Review
commit 598d25bf78
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linker/debugger.cpp
View File

@ -170,9 +170,9 @@ static void log_signal_summary(int signum, const siginfo_t* info) {
if (info != NULL) { if (info != NULL) {
// For a rethrown signal, this si_code will be right and the one debuggerd shows will // For a rethrown signal, this si_code will be right and the one debuggerd shows will
// always be SI_TKILL. // always be SI_TKILL.
snprintf(code_desc, sizeof(code_desc), ", code %d", info->si_code); __libc_format_buffer(code_desc, sizeof(code_desc), ", code %d", info->si_code);
if (has_address) { if (has_address) {
snprintf(addr_desc, sizeof(addr_desc), ", fault addr %p", info->si_addr); __libc_format_buffer(addr_desc, sizeof(addr_desc), ", fault addr %p", info->si_addr);
} }
} }
__libc_format_log(ANDROID_LOG_FATAL, "libc", __libc_format_log(ANDROID_LOG_FATAL, "libc",

16
linker/linker.cpp
View File

@ -866,7 +866,21 @@ static void soinfo_unload(soinfo* si) {
} }
void do_android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size) { void do_android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size) {
snprintf(buffer, buffer_size, "%s:%s", kDefaultLdPaths[0], kDefaultLdPaths[1]); // Use basic string manipulation calls to avoid snprintf.
// snprintf indirectly calls pthread_getspecific to get the size of a buffer.
// When debug malloc is enabled, this call returns 0. This in turn causes
// snprintf to do nothing, which causes libraries to fail to load.
// See b/17302493 for further details.
// Once the above bug is fixed, this code can be modified to use
// snprintf again.
size_t required_len = strlen(kDefaultLdPaths[0]) + strlen(kDefaultLdPaths[1]) + 2;
if (buffer_size < required_len) {
__libc_fatal("android_get_LD_LIBRARY_PATH failed, buffer too small: buffer len %zu, required len %zu",
buffer_size, required_len);
}
char* end = stpcpy(buffer, kDefaultLdPaths[0]);
*end = ':';
strcpy(end + 1, kDefaultLdPaths[1]);
} }
void do_android_update_LD_LIBRARY_PATH(const char* ld_library_path) { void do_android_update_LD_LIBRARY_PATH(const char* ld_library_path) {