commit c88968adc6b0df10a891ebfbf7e67a3f1ee3eeea
author Brian Carlstrom <bdc@google.com> Wed Dec 07 15:34:30 2011 -0800
committer Brian Carlstrom <bdc@google.com> Wed Dec 07 15:35:13 2011 -0800
tree 439c7bd94d197d95016f3b8a03db070a8f5d0955
parent 21a5bf2dc8c9cb3fbe5a30a88d1149c328e3aaca

Tolerate NULL method in Thread::GetCurrentMethod

Change-Id: I99ad1ce7852d177a6bdd277570b1b1d710ae5d58

src/thread.cc

diff --git a/src/thread.cc b/src/thread.cc
index b828e94..a9dfc23 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -1411,7 +1411,7 @@
     m = f.GetMethod();
   }
   if (pc != NULL) {
-    *pc = ManglePc(f.GetReturnPC());
+    *pc = (m != NULL) ? ManglePc(f.GetReturnPC()) : 0;
   }
   if (sp != NULL) {
     *sp = f.GetSP();