tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix reference to out of scope local in adb_thread_setname." am: b31ca1a64f

Browse source 
am: 15d565bbca

Change-Id: Ibb3694aa20648a1313b8e9de9a2f56628b863365
This commit is contained in:
Elliott Hughes 2017-08-03 00:19:33 +00:00 committed by android-build-merger
commit b664dd38b9
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
}