2008-12-10 Rodrigo Kumpera <rkumpera@novell.com>

class.c (mono_class_setup_fields): It working on an inflated class first check if the generic definition did init with success. Fixes #445361. svn path=/trunk/mono/; revision=121238
mono · Dec 10, 2008 · efa6899 · efa6899
1 parent ea16a5b
commit efa6899
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-10 Rodrigo Kumpera  <rkumpera@novell.com>
+
+	class.c (mono_class_setup_fields): It working on an inflated class
+	first check if the generic definition did init with success.
+
+	Fixes #445361.
+
 2008-12-10 Rodrigo Kumpera  <rkumpera@novell.com>
 
 	pedump.c (main): Fix a warning.

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
@@ -1052,6 +1052,11 @@ mono_class_setup_fields (MonoClass *class)
 		g_assert (container);
 
 		mono_class_setup_fields (gklass);
+
+		if (gklass->exception_type) {
+			mono_class_set_failure (class, MONO_EXCEPTION_TYPE_LOAD, NULL);
+			return;
+		}
 	}
 
 	/*