commit e2645d3e2db211bfd75775a2185c135ff387161a
author Ian Rogers <irogers@google.com> Wed Apr 11 14:42:42 2012 -0700
committer Ian Rogers <irogers@google.com> Wed Apr 11 15:32:48 2012 -0700
tree 623fdeb19171df63c01d0a36f75ecf6ec53dde8e
parent 4b952e74b4b2efa15cecedfc643c212eaeac2cc7

Fix bug in protected field access.

Change-Id: I38b094e54025d26950c0d8c8bb79d2de81d28428

src/runtime_support.cc

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index 38a680e..8c2b30c 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -357,14 +357,26 @@
   } else {
     Class* fields_class = resolved_field->GetDeclaringClass();
     Class* referring_class = referrer->GetDeclaringClass();
-    if (UNLIKELY(!referring_class->CanAccess(fields_class))) {
-      ThrowNewIllegalAccessErrorClass(self, referring_class, fields_class);
-      return NULL;  // failure
-    } else if (UNLIKELY(!referring_class->CanAccessMember(fields_class,
-                                                          resolved_field->GetAccessFlags()))) {
-      ThrowNewIllegalAccessErrorField(self, referring_class, resolved_field);
-      return NULL;  // failure
-    } else if (UNLIKELY(is_set && resolved_field->IsFinal() && (fields_class != referring_class))) {
+    if (UNLIKELY(!referring_class->CanAccess(fields_class) ||
+                 !referring_class->CanAccessMember(fields_class,
+                                                   resolved_field->GetAccessFlags()))) {
+      // The referring class can't access the resolved field, this may occur as a result of a
+      // protected field being made public by a sub-class. Resort to the dex file to determine
+      // the correct class for the access check.
+      const DexFile& dex_file = class_linker->FindDexFile(referring_class->GetDexCache());
+      fields_class = class_linker->ResolveType(dex_file,
+                                               dex_file.GetFieldId(field_idx).class_idx_,
+                                               referring_class);
+      if (UNLIKELY(!referring_class->CanAccess(fields_class))) {
+        ThrowNewIllegalAccessErrorClass(self, referring_class, fields_class);
+        return NULL;  // failure
+      } else if (UNLIKELY(!referring_class->CanAccessMember(fields_class,
+                                                            resolved_field->GetAccessFlags()))) {
+        ThrowNewIllegalAccessErrorField(self, referring_class, resolved_field);
+        return NULL;  // failure
+      }
+    }
+    if (UNLIKELY(is_set && resolved_field->IsFinal() && (fields_class != referring_class))) {
       ThrowNewIllegalAccessErrorFinalField(self, referrer, resolved_field);
       return NULL;  // failure
     } else {