Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7462f185 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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: default avatarIvan Maidanski <i.maidanski@samsung.com>
Change-Id: Ib3bdf53658f3903de8f0a5688f7d77745e677c77
parent 0d2cac9e
Loading
Loading
Loading
Loading
+6 −12
Original line number Diff line number Diff line
@@ -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];
    // 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';
        s = buf;
    }

    return pthread_setname_np(pthread_self(), s) ;
    return pthread_setname_np(pthread_self(), buf);
#endif
}