commit 3944f7175dcf60316ba58a42698ccf23c65ac57c
author Jeff Hao <jeffhao@google.com> Fri Nov 20 23:07:59 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 20 23:07:59 2015 +0000
tree b0b7013ea78b10f23fae75ef145e53a696ff797c
parent 9ee6ec52a2b53fc2f4e7f87296d454b3940c60c3
parent d297b554b673bbc627c8080d177defe1b4fd8c58

Merge "Fix null pointer in processing of enum annotations."

runtime/dex_file.cc

diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc
index 70096f5..4163e2e 100644
--- a/runtime/dex_file.cc
+++ b/runtime/dex_file.cc
@@ -1870,10 +1870,10 @@
         Handle<mirror::ClassLoader> class_loader(hs.NewHandle(klass->GetClassLoader()));
         ArtField* enum_field = Runtime::Current()->GetClassLinker()->ResolveField(
             klass->GetDexFile(), index, dex_cache, class_loader, true);
-        Handle<mirror::Class> field_class(hs.NewHandle(enum_field->GetDeclaringClass()));
         if (enum_field == nullptr) {
           return false;
         } else {
+          Handle<mirror::Class> field_class(hs.NewHandle(enum_field->GetDeclaringClass()));
           Runtime::Current()->GetClassLinker()->EnsureInitialized(self, field_class, true, true);
           element_object = enum_field->GetObject(field_class.Get());
           set_object = true;