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

Commit d497310b authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

Merge "Correct off-by-one error in SetThreadName" am: bb1686a6 am: 8da7bd5d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019395

Change-Id: I1d7205857a242ea1882d23cf27e2cb8b3de7b622
parents 85ea70c3 8da7bd5d

core/jni/com_android_internal_os_Zygote.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -895,7 +895,7 @@ void SetThreadName(const std::string& thread_name) { 




  // pthread_setname_np fails rather than truncating long strings.

  // pthread_setname_np fails rather than truncating long strings.

  char buf[16];       // MAX_TASK_COMM_LEN=16 is hard-coded into bionic

  char buf[16];       // MAX_TASK_COMM_LEN=16 is hard-coded into bionic

  strlcpy(buf, name_start_ptr, sizeof(buf) - 1);

  strlcpy(buf, name_start_ptr, sizeof(buf));

  errno = pthread_setname_np(pthread_self(), buf);

  errno = pthread_setname_np(pthread_self(), buf);

  if (errno != 0) {

  if (errno != 0) {

    ALOGW("Unable to set the name of current thread to '%s': %s", buf, strerror(errno));

    ALOGW("Unable to set the name of current thread to '%s': %s", buf, strerror(errno));