commit 3595a09a6fff5483f69f0f714128646c17a03216
author Barry Hayes <bhayes@google.com> Mon May 24 12:13:30 2010 -0700
committer Barry Hayes <bhayes@google.com> Mon May 24 12:13:30 2010 -0700
tree 348e937fed790d9fb1bd40631c99d89e3e7a06f8
parent e3c01dac83e6eea7f82fe81ed89cfbdd9791dbc9

Check the number of slots in the Class.java definition against the number assumed by the VM, and abort if the Class has too many.

Change-Id: Ibcf4539ab98639c1c92e5d910c38ee1feb9c8c43

vm/oo/Class.c

diff --git a/vm/oo/Class.c b/vm/oo/Class.c
index a34b983..119907e 100644
--- a/vm/oo/Class.c
+++ b/vm/oo/Class.c
@@ -2478,6 +2478,11 @@
             strcmp(clazz->descriptor, "Ljava/lang/Class;") == 0)
         {
             gDvm.classJavaLangClass = clazz;
+            if (clazz->ifieldCount > CLASS_FIELD_SLOTS) {
+                LOGE("java.lang.Class has %d slots (expected %d)",
+                     clazz->ifieldCount, CLASS_FIELD_SLOTS);
+                dvmAbort();
+            }
         } else {
             gDvm.classJavaLangClass =
                 dvmFindSystemClassNoInit("Ljava/lang/Class;");