Author: zoltan
Date: 2005-06-02 10:00:50 -0400 (Thu, 02 Jun 2005)
New Revision: 45325
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/reflection.c
Log:
2005-06-02 Zoltan Varga <[EMAIL PROTECTED]>
* reflection.c (mono_image_get_method_info): Handle the case when
dllentry is empty.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-06-02 12:05:37 UTC (rev 45324)
+++ trunk/mono/mono/metadata/ChangeLog 2005-06-02 14:00:50 UTC (rev 45325)
@@ -1,3 +1,8 @@
+2005-06-02 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * reflection.c (mono_image_get_method_info): Handle the case when
+ dllentry is empty.
+
2005-06-02 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* object.c: When creating the vtable for a proxy, take into account
Modified: trunk/mono/mono/metadata/reflection.c
===================================================================
--- trunk/mono/mono/metadata/reflection.c 2005-06-02 12:05:37 UTC (rev
45324)
+++ trunk/mono/mono/metadata/reflection.c 2005-06-02 14:00:50 UTC (rev
45325)
@@ -1387,7 +1387,10 @@
values [MONO_IMPLMAP_FLAGS] = (mb->native_cc << 8) | ncharset |
extra_flags;
values [MONO_IMPLMAP_MEMBER] = (mb->table_idx << 1) | 1; /*
memberforwarded: method */
- name = mono_string_to_utf8 (mb->dllentry);
+ if (mb->dllentry)
+ name = mono_string_to_utf8 (mb->dllentry);
+ else
+ name = mono_string_to_utf8 (mb->name);
values [MONO_IMPLMAP_NAME] = string_heap_insert
(&assembly->sheap, name);
g_free (name);
name = mono_string_to_utf8 (mb->dll);
@@ -9503,4 +9506,3 @@
else
return *(MonoBoolean*)mono_object_unbox (res);
}
-
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
