am bc03380a: Merge "Remove an assertion that JDWP packets are small."

[android-x86/dalvik.git] / libdex / DexSwapVerify.cpp

diff --git a/libdex/DexSwapVerify.cpp b/libdex/DexSwapVerify.cpp
index 4b3cf44..6cc139d 100644 (file)
--- a/libdex/DexSwapVerify.cpp
+++ b/libdex/DexSwapVerify.cpp
@@ -911,6 +911,11 @@ static void* swapClassDefItem(const CheckState* state, void* ptr) {
     SWAP_OFFSET4(item->annotationsOff);
     SWAP_OFFSET4(item->classDataOff);
 
+    if ((item->accessFlags & ~ACC_CLASS_MASK) != 0) {
+        ALOGE("Bogus class access flags %x", item->accessFlags);
+        return NULL;
+    }
+
     return item + 1;
 }