commit 90f2b3096ae603d81767f83eda073a1b8901cb24
author Ian Rogers <irogers@google.com> Sat Oct 29 15:05:54 2011 -0700
committer Ian Rogers <irogers@google.com> Sat Oct 29 15:05:54 2011 -0700
tree 700983306de53c76f302e7e9d12347120e5a0aa0
parent 28ad40dc3ec2f09b0ffd4f6d6787bf1b532ccd5d

Allow array length on null to pass verification.

Change-Id: I1986932cbd620702153286f191b3c7f3c91b31a7

src/dex_verifier.cc

diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc
index 79f90e7..8793c95 100644
--- a/src/dex_verifier.cc
+++ b/src/dex_verifier.cc
@@ -2045,7 +2045,7 @@
     case Instruction::ARRAY_LENGTH: {
       const RegType& res_type = work_line_->GetRegisterType(dec_insn.vB_);
       if (res_type.IsReferenceTypes()) {
-        if (!res_type.IsArrayClass()) {
+        if (!res_type.IsArrayClass() && !res_type.IsZero()) {  // ie not an array or null
           Fail(VERIFY_ERROR_GENERIC) << "array-length on non-array " << res_type;
         } else {
           work_line_->SetRegisterType(dec_insn.vA_, reg_types_.Integer());