commit b28412e3fcc97fbcd0a11d25703a4ad64c3d9552
author Mathieu Chartier <mathieuc@google.com> Fri Apr 24 15:28:36 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Apr 24 15:28:36 2015 -0700
tree 9e4df825a6ef666ee714c782421dfb826e2703df
parent 76f1413492c228bfa710e1eaa4c60370eaffbb8a

Guard against name == null in ShortDump

Bug: 20561804
Change-Id: If1e4adb74d5b936cf171f2402bf4525bf8c2d209

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index b27ad4a..9f7c303 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -572,13 +572,13 @@
   if (GetThreadId() != 0) {
     // If we're in kStarting, we won't have a thin lock id or tid yet.
     os << GetThreadId()
-             << ",tid=" << GetTid() << ',';
+       << ",tid=" << GetTid() << ',';
   }
   os << GetState()
-           << ",Thread*=" << this
-           << ",peer=" << tlsPtr_.opeer
-           << ",\"" << *tlsPtr_.name << "\""
-           << "]";
+     << ",Thread*=" << this
+     << ",peer=" << tlsPtr_.opeer
+     << ",\"" << (tlsPtr_.name != nullptr ? *tlsPtr_.name : "null") << "\""
+     << "]";
 }
 
 void Thread::Dump(std::ostream& os) const {