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

* commit '6ba555f2ad878129cd1da9dd7b7613ab166090ab': libutils: Don't segfault ProcessCallStack when getting thread name fails
2014-08-19 23:44:28 +00:00 · 2014-08-19 23:44:28 +00:00 · 831789a9f2
parent a4c647b698 6ba555f2ad
commit 831789a9f2
1 changed files with 5 additions and 0 deletions
--- a/libutils/ProcessCallStack.cpp
+++ b/libutils/ProcessCallStack.cpp
@ -90,6 +90,11 @@ static String8 getThreadName(pid_t tid) {
        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");