2010-04-15 Rodrigo Kumpera <rkumpera@novell.com>

	* class.c (mono_class_get_method_by_index): Return NULL
	on type load failures.

svn path=/trunk/mono/; revision=155545

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index c5701ae5dca1c26373edc64ce9e92d27c74d258a..adb28c9852730331a23a8843a22cd9440f4b2cc3 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-15 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * class.c (mono_class_get_method_by_index): Return NULL
+       on type load failures.
+
 2010-04-15 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * class.c (mono_class_from_typeref): Check if the supplied

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 2dc66c993bb49850691a7719788dcea6d5da40ee..a6c1a32d3a1fe44e96409c24971d0beacb3f78e8 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -1939,7 +1939,8 @@ mono_class_get_method_by_index (MonoClass *class, int index)
                return m;
        } else {
                mono_class_setup_methods (class);
-               g_assert (!class->exception_type); /*FIXME do proper error handling*/
+               if (class->exception_type) /*FIXME do proper error handling*/
+                       return NULL;
                g_assert (index >= 0 && index < class->method.count);
                return class->methods [index];
        }