Thu Mar 28 12:32:00 CET 2002 Paolo Molaro <lupus@ximian.com>

	* loader.c: don't assert when a typeref can't be loaded, give
	a chance to the runtime to trow an exception instead.
	* loader.h: fix warning.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 0eb04adbeb52f885e2ee43cec8dc7da8136df84d..bf0363b883c913a3090b9bc8da8fc72b987e0fcc 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,10 @@
+
+Thu Mar 28 12:32:00 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+       * loader.c: don't assert when a typeref can't be loaded, give
+       a chance to the runtime to trow an exception instead.
+       * loader.h: fix warning.
+
 2002-03-28  Dietmar Maurer  <dietmar@ximian.com>
 
        * class.c (mono_class_proxy_vtable): added proxy support

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index d99fdea9a2fd196bd8665f54df63c0319b74c919..dc74573bf9706cf3bca9fac00c2a7f06cd888033 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -222,7 +222,11 @@ method_from_memberref (MonoImage *image, guint32 index)
                        mimage = image->references [scopeindex-1]->image;
 
                        klass = mono_class_from_name (mimage, nspace, name);
-                       g_assert (klass != NULL);
+                       if (!klass) {
+                               g_warning ("Missing method %s.%s::%s", nspace, name, mname);
+                               mono_metadata_free_method_signature (sig);
+                               return NULL;
+                       }
                        mono_class_init (klass);
 
                        /* mostly dumb search for now */

diff --git a/mono/metadata/loader.h b/mono/metadata/loader.h
index ec4dcfdf2b613b6b81224adae34a7e97cc390dc9..1e0b2fd2ba7c086fa41f88270a8f1cd67e5af369 100644 (file)
--- a/mono/metadata/loader.h
+++ b/mono/metadata/loader.h
@@ -25,7 +25,7 @@ typedef struct {
 typedef struct {
        MonoMethod method;
        guint16 piflags;  /* pinvoke flags */
-       void  (*code) ();
+       void  (*code) (void);
 } MonoMethodPInvoke;
 
 typedef struct {