commit 613831b958339d69cd7a4091b962765605e121f9
author Igor Murashkin <iam@google.com> Tue Aug 19 23:57:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 19 23:57:54 2014 +0000
tree d93e2b66c53bf8da6dbe9b6b0632685023f7d65d
parent 6ff2fd9376b3273d0775df8a1ee6d0e834a23541
parent 831789a9f257bd929caa2fb927c4b902459cce53

am 831789a9: am 6ba555f2: Merge "libutils: Don\'t segfault ProcessCallStack when getting thread name fails" into lmp-dev

* commit '831789a9f257bd929caa2fb927c4b902459cce53':
  libutils: Don't segfault ProcessCallStack when getting thread name fails

libutils/ProcessCallStack.cpp

diff --git a/libutils/ProcessCallStack.cpp b/libutils/ProcessCallStack.cpp
index f837bcb..db07e56 100644
--- a/libutils/ProcessCallStack.cpp
+++ b/libutils/ProcessCallStack.cpp
@@ -90,6 +90,11 @@
         ALOGE("%s: Failed to open %s", __FUNCTION__, path);
     }
 
+    if (procName == NULL) {
+        // Reading /proc/self/task/%d/comm failed due to a race
+        return String8::format("[err-unknown-tid-%d]", tid);
+    }
+
     // Strip ending newline
     strtok(procName, "\n");