commit d2bee3dffa2f552512f47bca605ed857e3ae30ea
author Jeff Hao <jeffhao@google.com> Wed Oct 29 17:24:25 2014 -0700
committer Jeff Hao <jeffhao@google.com> Mon Nov 03 10:57:35 2014 -0800
tree 5f851ec472f7de8a3d1e708aea77ad2318e36126
parent 22c84690dba1c02b4f9fdc3774a85f89d2208fa4

Check null this pointer for direct methods in FindMethodFast.

Also adds regression test 122-secondarydex.

Bug: 18150997
Change-Id: If3ddc67b84ccbf3b47c78854178c0a24952c5824

runtime/entrypoints/entrypoint_utils-inl.h

diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h
index 7aee01d..c0b7b06 100644
--- a/runtime/entrypoints/entrypoint_utils-inl.h
+++ b/runtime/entrypoints/entrypoint_utils-inl.h
@@ -536,8 +536,7 @@
                                                 mirror::Object* this_object,
                                                 mirror::ArtMethod* referrer,
                                                 bool access_check, InvokeType type) {
-  bool is_direct = type == kStatic || type == kDirect;
-  if (UNLIKELY(this_object == NULL && !is_direct)) {
+  if (UNLIKELY(this_object == NULL && type != kStatic)) {
     return NULL;
   }
   mirror::ArtMethod* resolved_method =
@@ -562,7 +561,7 @@
   }
   if (type == kInterface) {  // Most common form of slow path dispatch.
     return this_object->GetClass()->FindVirtualMethodForInterface(resolved_method);
-  } else if (is_direct) {
+  } else if (type == kStatic || type == kDirect) {
     return resolved_method;
   } else if (type == kSuper) {
     return referrer->GetDeclaringClass()->GetSuperClass()