commit 4a24858d432331049c416ae6a5993762bfe5e438
author Mathieu Chartier <mathieuc@google.com> Tue Apr 28 13:53:02 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Apr 28 14:02:51 2015 -0700
tree 39048cae88792e37debe1925ef9ee805743a27c2
parent b8df6601f2119fd90150761388057dbe893bb6ae

Fix possible null deference in Throwable::Dump

Bug: 20640601

Change-Id: Ibd6081ed9ea16f320e505e06e690b8eddb1228ef

runtime/mirror/throwable.cc

diff --git a/runtime/mirror/throwable.cc b/runtime/mirror/throwable.cc
index ca94644..782b9c0 100644
--- a/runtime/mirror/throwable.cc
+++ b/runtime/mirror/throwable.cc
@@ -115,10 +115,14 @@
       } else {
         for (int32_t i = 0; i < ste_array->GetLength(); ++i) {
           StackTraceElement* ste = ste_array->Get(i);
-          result += StringPrintf("  at %s (%s:%d)\n",
-                                 ste->GetMethodName()->ToModifiedUtf8().c_str(),
-                                 ste->GetFileName()->ToModifiedUtf8().c_str(),
-                                 ste->GetLineNumber());
+          DCHECK(ste != nullptr);
+          auto* method_name = ste->GetMethodName();
+          auto* file_name = ste->GetFileName();
+          result += StringPrintf(
+              "  at %s (%s:%d)\n",
+              method_name != nullptr ? method_name->ToModifiedUtf8().c_str() : "<unknown method>",
+              file_name != nullptr ? file_name->ToModifiedUtf8().c_str() : "(Unknown Source)",
+              ste->GetLineNumber());
         }
       }
     } else {