Fix a case where class->instance_size was not set for dynamic classes.

mono · Mar 28, 2011 · 6d45f25 · 6d45f25
1 parent 13ab89e
commit 6d45f25
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/mono/metadata/class.c b/mono/metadata/class.c
@@ -1669,10 +1669,16 @@ mono_class_layout_fields (MonoClass *class)
 		if (layout != TYPE_ATTRIBUTE_AUTO_LAYOUT)
 			passes = 1;
 
-		if (class->parent)
+		if (class->parent) {
+			mono_class_setup_fields (class->parent);
+			if (class->parent->exception_type) {
+				mono_class_set_failure (class, MONO_EXCEPTION_TYPE_LOAD, NULL);
+				return;
+			}
 			real_size = class->parent->instance_size;
-		else
+		} else {
 			real_size = sizeof (MonoObject);
+		}
 
 		for (pass = 0; pass < passes; ++pass) {
 			for (i = 0; i < top; i++){