2009-03-02 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index b1361dabc074f5da9b4b578332a240ac9634af5b..39766cb0237a0e16c3c5ccca349f1dd6f33911a4 100644 (file)
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -615,6 +615,7 @@ mono_image_init (MonoImage *image)
 
        image->property_hash = mono_property_hash_new ();
        InitializeCriticalSection (&image->lock);
+       InitializeCriticalSection (&image->szarray_cache_lock);
 }
 
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
@@ -1432,6 +1433,8 @@ mono_image_close (MonoImage *image)
                g_hash_table_foreach (image->array_cache, free_array_cache_entry, NULL);
                g_hash_table_destroy (image->array_cache);
        }
+       if (image->szarray_cache)
+               g_hash_table_destroy (image->szarray_cache);
        if (image->ptr_cache)
                g_hash_table_destroy (image->ptr_cache);
        if (image->name_cache) {
@@ -1506,6 +1509,7 @@ mono_image_close (MonoImage *image)
                g_free (image->references);
        mono_perfcounters->loader_bytes -= mono_mempool_get_allocated (image->mempool);
 
+       DeleteCriticalSection (&image->szarray_cache_lock);
        DeleteCriticalSection (&image->lock);
 
        /*g_print ("destroy image %p (dynamic: %d)\n", image, image->dynamic);*/
@@ -1574,11 +1578,11 @@ mono_image_walk_resource_tree (MonoCLIImageInfo *info, guint32 res_id,
        dir_offset = MONO_PE_RES_DIR_ENTRY_DIR_OFFSET (*entry);
 
        if(level==0) {
-               if((is_string==FALSE && name_offset!=res_id) ||
-                  (is_string==TRUE)) {
-                       return(NULL);
-               }
+               if (is_string)
+                       return NULL;
        } else if (level==1) {
+               if (res_id != name_offset)
+                       return NULL;
 #if 0
                if(name!=NULL &&
                   is_string==TRUE && name!=lookup (name_offset)) {
@@ -1586,12 +1590,8 @@ mono_image_walk_resource_tree (MonoCLIImageInfo *info, guint32 res_id,
                }
 #endif
        } else if (level==2) {
-               if ((is_string == FALSE &&
-                   name_offset != lang_id &&
-                   lang_id != 0) ||
-                  (is_string == TRUE)) {
-                       return(NULL);
-               }
+               if (is_string == TRUE || (is_string == FALSE && lang_id != 0 && name_offset != lang_id))
+                       return NULL;
        } else {
                g_assert_not_reached ();
        }
@@ -1658,6 +1658,8 @@ mono_image_lookup_resource (MonoImage *image, guint32 res_id, guint32 lang_id, g
                return(NULL);
        }
 
+       mono_image_ensure_section_idx (image, MONO_SECTION_RSRC);
+
        info=image->image_info;
        if(info==NULL) {
                return(NULL);