diff options
| author | 2011-12-07 15:34:30 -0800 | |
|---|---|---|
| committer | 2011-12-07 15:35:13 -0800 | |
| commit | c88968adc6b0df10a891ebfbf7e67a3f1ee3eeea (patch) | |
| tree | 439c7bd94d197d95016f3b8a03db070a8f5d0955 /src | |
| parent | 21a5bf2dc8c9cb3fbe5a30a88d1149c328e3aaca (diff) | |
Tolerate NULL method in Thread::GetCurrentMethod
Change-Id: I99ad1ce7852d177a6bdd277570b1b1d710ae5d58
Diffstat (limited to 'src')
| -rw-r--r-- | src/thread.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread.cc b/src/thread.cc index b828e948dd..a9dfc23310 100644 --- a/src/thread.cc +++ b/src/thread.cc @@ -1411,7 +1411,7 @@ Method* Thread::GetCurrentMethod(uintptr_t* pc, Method*** sp) const { m = f.GetMethod(); } if (pc != NULL) { - *pc = ManglePc(f.GetReturnPC()); + *pc = (m != NULL) ? ManglePc(f.GetReturnPC()) : 0; } if (sp != NULL) { *sp = f.GetSP(); |