commit ca3f0f5df3e1d8507de3fad42ae6e3cace7147b6
author Ben Gruver <bgruv@google.com> Mon May 06 10:47:25 2013 -0700
committer Ben Gruver <bgruv@google.com> Mon May 06 10:47:25 2013 -0700
tree 916459aa96f4666ba614f58563466aa1a474921b
parent 69fcce644574d25339a71cfe2c9821bbfaf8b731

Reject dex files that attempt to use unspecified class access flags

Change-Id: Ib1ecf3dfe1856a9014c2e9b0d6a1725ba7617f98

vm/analysis/DexPrepare.cpp

diff --git a/vm/analysis/DexPrepare.cpp b/vm/analysis/DexPrepare.cpp
index e8112d5..cef1996 100644
--- a/vm/analysis/DexPrepare.cpp
+++ b/vm/analysis/DexPrepare.cpp
@@ -967,6 +967,12 @@
         classDescriptor =
             dexStringByTypeIdx(pDvmDex->pDexFile, pClassDef->classIdx);
 
+        if ((pClassDef->accessFlags & ~ACC_CLASS_MASK) != 0) {
+            ALOGE("DexOpt: invalid access flags 0x%08x for class '%s'",
+                pClassDef->accessFlags, classDescriptor);
+            return false;
+        }
+
         ALOGV("+++  loading '%s'", classDescriptor);
         //newClass = dvmDefineClass(pDexFile, classDescriptor,
         //        NULL);