From ccb1a5d46bc1b4ee888e74775f5c1291d600ff54 Mon Sep 17 00:00:00 2001 From: Stephen Kyle Date: Fri, 22 Aug 2014 15:03:07 +0100 Subject: [PATCH] ART: Reject field accesses to non-reference vregs. The verifier will now reject any iget/iput insts that do not have a reference object in vB. Bug: 17207857 Signed-off-by: Stuart Monteith (cherry picked from commit 695c5982eeddee18c643cc2f94c9d78fa75599ab) Change-Id: I3790b8687673643bb142549d74f36a3e2978bf13 --- runtime/verifier/method_verifier.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc index fb57fc738..c375c771a 100644 --- a/runtime/verifier/method_verifier.cc +++ b/runtime/verifier/method_verifier.cc @@ -3644,6 +3644,11 @@ mirror::ArtField* MethodVerifier::GetInstanceField(RegType& obj_type, int field_ } else if (obj_type.IsZero()) { // Cannot infer and check type, however, access will cause null pointer exception return field; + } else if (!obj_type.IsReferenceTypes()) { + // Trying to read a field from something that isn't a reference + Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "instance field access on object that has " + << "non-reference type " << obj_type; + return NULL; } else { mirror::Class* klass = field->GetDeclaringClass(); RegType& field_klass = -- 2.11.0