2007-05-28 Zoltan Varga <vargaz@gmail.com>

	* icall.c (ves_icall_get_method_info): Handle loader errors. Fixes #81724.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index e98c694206cd0d81007d6c086180a9aba2d31cc0..452cce89ca2d55c332fdc24c0c2fdef0174c2e55 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-28  Zoltan Varga  <vargaz@gmail.com>
+
+       * icall.c (ves_icall_get_method_info): Handle loader errors. Fixes #81724.
+
 2007-05-25  Jonathan Chambers  <joncham@gmail.com>
 
        * marshal.c: Fix interface lookup loops for

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 6446e02bf0b1c174c2fbd3f58c4a021d8c67ea7d..4c1e52685c90124c02ee6b3e035c155642201b30 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -1357,6 +1357,10 @@ ves_icall_get_method_info (MonoMethod *method, MonoMethodInfo *info)
                method = mono_get_inflated_method (method);
 
        sig = mono_method_signature (method);
+       if (!sig) {
+               g_assert (mono_loader_get_last_error ());
+               mono_raise_exception (mono_loader_error_prepare_exception (mono_loader_get_last_error ()));
+       }
        
        info->parent = mono_type_get_object (domain, &method->klass->byval_arg);
        info->ret = mono_type_get_object (domain, sig->ret);