Make the thread dump code safe by doing only async safe operations when a thread...

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

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 04b597af1398c1c904ba7975f78472d42497bd64..d733afeed2a66a9fa4c5ec3f56a9714726e1b626 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -632,7 +632,7 @@ inflate_generic_type (MonoImage *image, MonoType *type, MonoGenericContext *cont
                MonoType *nt;
                int num = mono_type_get_generic_param_num (type);
                MonoGenericInst *inst = context->method_inst;
-               if (!inst || !inst->type_argv)
+               if (!inst)
                        return NULL;
                if (num >= inst->type_argc) {
                        MonoGenericParamInfo *info = mono_generic_param_info (type->data.generic_param);
@@ -7510,6 +7510,8 @@ mono_image_init_name_cache (MonoImage *image)
        }
 
        g_hash_table_destroy (name_cache2);
+
+       mono_image_lock (image);
        if (image->name_cache) {
                /* Somebody initialized it before us */
                g_hash_table_destroy (the_name_cache);