summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author Shih-wei Liao <sliao@google.com> 2012-03-09 13:05:11 -0800
committer Shih-wei Liao <sliao@google.com> 2012-03-09 14:07:00 -0800
commit0b440ef78eae4f1c8558dca549e9c94a84f42639 (patch)
tree19dbd7cf27e3ab3bffab3f8fe74a709b33b1023f /src
parenta433b2e8edf91c8124abd8eb5b3bd558a40fc987 (diff)
Fix crashes.
The bug was due to a refactoring error last night. We will also take out _artInvokeCommon and other confusing de-dup in the next CL. But I want to fix the crash right away. Change-Id: Ic3fcb0bbaaca44cf368f79994a0cdcfac5fdfc8b
Diffstat (limited to 'src')
-rw-r--r--src/runtime_support_common.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/runtime_support_common.h b/src/runtime_support_common.h
index d4da2def97..adab93616e 100644
--- a/src/runtime_support_common.h
+++ b/src/runtime_support_common.h
@@ -282,6 +282,9 @@ uint64_t artInvokeCommon(uint32_t method_idx, Object* this_object, Method* calle
Thread* self, Method** sp, bool access_check, InvokeType type){
Method* method = _artInvokeCommon(method_idx, this_object, caller_method,
self, sp, access_check, type);
+ if (method == NULL) {
+ return 0; // failure
+ }
const void* code = method->GetCode();
uint32_t method_uint = reinterpret_cast<uint32_t>(method);