Fix a mach port leak

[mono.git] / mono / metadata / loader.c

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index f9864a093dda1d10a1c9d699648da5bcb7bd1da3..9e06e131315d27f7225e85f70e98f59ba09317bd 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -60,6 +60,7 @@ static gboolean loader_lock_inited;
 static guint32 inflated_signatures_size;
 static guint32 memberref_sig_cache_size;
 static guint32 methods_size;
+static guint32 signatures_size;
 
 /*
  * This TLS variable contains the last type load error encountered by the loader.
@@ -92,6 +93,8 @@ mono_loader_init ()
                                                                MONO_COUNTER_METADATA | MONO_COUNTER_INT, &memberref_sig_cache_size);
                mono_counters_register ("MonoMethod size",
                                                                MONO_COUNTER_METADATA | MONO_COUNTER_INT, &methods_size);
+               mono_counters_register ("MonoMethodSignature size",
+                                                               MONO_COUNTER_METADATA | MONO_COUNTER_INT, &signatures_size);
 
                inited = TRUE;
        }
@@ -439,7 +442,7 @@ field_from_memberref (MonoImage *image, guint32 token, MonoClass **retklass,
 
        fname = mono_metadata_string_heap (image, cols [MONO_MEMBERREF_NAME]);
 
-       if (!mono_verifier_verify_memberref_signature (image, cols [MONO_MEMBERREF_SIGNATURE], NULL)) {
+       if (!mono_verifier_verify_memberref_field_signature (image, cols [MONO_MEMBERREF_SIGNATURE], NULL)) {
                mono_loader_set_error_bad_image (g_strdup_printf ("Bad field signature class token 0x%08x field name %s token 0x%08x on image %s", class, fname, token, image->name));
                return NULL;
        }
@@ -608,9 +611,11 @@ find_method_in_class (MonoClass *klass, const char *name, const char *qname, con
                                continue;
 
                        method = mono_get_method (klass->image, MONO_TOKEN_METHOD_DEF | (klass->method.first + i + 1), klass);
-                       other_sig = mono_method_signature (method);
-                       if (method && other_sig && (sig->call_convention != MONO_CALL_VARARG) && mono_metadata_signature_equal (sig, other_sig))
-                               return method;
+                       if (method) {
+                               other_sig = mono_method_signature (method);
+                               if (other_sig && (sig->call_convention != MONO_CALL_VARARG) && mono_metadata_signature_equal (sig, other_sig))
+                                       return method;
+                       }
                }
        }
 
@@ -626,6 +631,10 @@ find_method_in_class (MonoClass *klass, const char *name, const char *qname, con
                MonoMethod *m = klass->methods [i];
                MonoMethodSignature *msig;
 
+               /* We must cope with failing to load some of the types. */
+               if (!m)
+                       continue;
+
                if (!((fqname && !strcmp (m->name, fqname)) ||
                      (qname && !strcmp (m->name, qname)) ||
                      (name && !strcmp (m->name, name))))
@@ -678,7 +687,16 @@ find_method (MonoClass *in_class, MonoClass *ic, const char* name, MonoMethodSig
                if (name [0] == '.' && (!strcmp (name, ".ctor") || !strcmp (name, ".cctor")))
                        break;
 
-               g_assert (from_class->interface_offsets_count == in_class->interface_offsets_count);
+               /*
+                * This happens when we fail to lazily load the interfaces of one of the types.
+                * On such case we can't just bail out since user code depends on us trying harder.
+                */
+               if (from_class->interface_offsets_count != in_class->interface_offsets_count) {
+                       in_class = in_class->parent;
+                       from_class = from_class->parent;
+                       continue;
+               }
+
                for (i = 0; i < in_class->interface_offsets_count; i++) {
                        MonoClass *in_ic = in_class->interfaces_packed [i];
                        MonoClass *from_ic = from_class->interfaces_packed [i];
@@ -824,7 +842,7 @@ mono_method_get_signature_full (MonoMethod *method, MonoImage *image, guint32 to
 
                sig = find_cached_memberref_sig (image, sig_idx);
                if (!sig) {
-                       if (!mono_verifier_verify_memberref_signature (image, sig_idx, NULL)) {
+                       if (!mono_verifier_verify_memberref_method_signature (image, sig_idx, NULL)) {
                                guint32 class = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
                                const char *fname = mono_metadata_string_heap (image, cols [MONO_MEMBERREF_NAME]);
 
@@ -975,7 +993,7 @@ method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *typesp
 
        sig_idx = cols [MONO_MEMBERREF_SIGNATURE];
 
-       if (!mono_verifier_verify_memberref_signature (image, sig_idx, NULL)) {
+       if (!mono_verifier_verify_memberref_method_signature (image, sig_idx, NULL)) {
                mono_loader_set_error_method_load (klass->name, mname);
                return NULL;
        }
@@ -1067,6 +1085,9 @@ method_from_methodspec (MonoImage *image, MonoGenericContext *context, guint32 i
        g_assert (param_count);
 
        inst = mono_metadata_parse_generic_inst (image, NULL, param_count, ptr, &ptr);
+       if (!inst)
+               return NULL;
+
        if (context && inst->is_open) {
                inst = mono_metadata_inflate_generic_inst (inst, context, &error);
                if (!mono_error_ok (&error)) {
@@ -1235,7 +1256,7 @@ cached_module_load (const char *name, int flags, char **err)
                mono_loader_unlock ();
                return res;
        }
-       res = mono_dl_open (name, flags, NULL);
+       res = mono_dl_open (name, flags, err);
        if (res)
                g_hash_table_insert (global_module_map, g_strdup (name), res);
        mono_loader_unlock ();
@@ -1500,6 +1521,8 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
                                                                "Probing '%s'.", mangled_name2);
 
                                        error_msg = mono_dl_symbol (module, mangled_name2, &piinfo->addr);
+                                       g_free (error_msg);
+                                       error_msg = NULL;
 
                                        if (piinfo->addr)
                                                mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT,
@@ -2251,6 +2274,8 @@ mono_method_signature_checked (MonoMethod *m, MonoError *error)
 
                if (can_cache_signature)
                        g_hash_table_insert (img->method_signatures, (gpointer)sig, signature);
+
+               signatures_size += mono_metadata_signature_size (signature);
        }
 
        /* Verify metadata consistency */