openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix reference to out of scope local in adb_thread_setname. 

Bug: https://android-review.googlesource.com/#/c/168725/5/adb/sysdeps.h@639
Test: boots, adbd thread names look sane
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Change-Id: Ib3bdf53658f3903de8f0a5688f7d77745e677c77
This commit is contained in:
Elliott Hughes 2017-08-02 13:22:38 -07:00
parent 0d2cac9ea8
commit 7462f1858c
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
adb/sysdeps.h
View File

@ -582,18 +582,12 @@ static __inline__ int adb_thread_setname(const std::string& name) {
#ifdef __APPLE__
return pthread_setname_np(name.c_str());
#else
const char *s = name.c_str();
// pthread_setname_np fails rather than truncating long strings.
const int max_task_comm_len = 16; // including the null terminator
if (name.length() > (max_task_comm_len - 1)) {
char buf[max_task_comm_len];
strncpy(buf, name.c_str(), sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
s = buf;
}
return pthread_setname_np(pthread_self(), s) ;
// Both bionic and glibc's pthread_setname_np fails rather than truncating long strings.
// glibc doesn't have strlcpy, so we have to fake it.
char buf[16]; // MAX_TASK_COMM_LEN, but that's not exported by the kernel headers.
strncpy(buf, name.c_str(), sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
return pthread_setname_np(pthread_self(), buf);
#endif
}