Author: zoltan
Date: 2007-10-17 17:43:35 -0400 (Wed, 17 Oct 2007)
New Revision: 87720
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/class.c
Log:
2007-10-18 Zoltan Varga <[EMAIL PROTECTED]>
* class.c (mono_class_from_name): Search the modules compromising
dynamic
assemblies. Fixes #331601.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-10-17 21:38:37 UTC (rev 87719)
+++ trunk/mono/mono/metadata/ChangeLog 2007-10-17 21:43:35 UTC (rev 87720)
@@ -1,3 +1,8 @@
+2007-10-18 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * class.c (mono_class_from_name): Search the modules compromising
dynamic
+ assemblies. Fixes #331601.
+
2007-10-16 Zoltan Varga <[EMAIL PROTECTED]>
* icall.c (ves_icall_System_Reflection_Assembly_InternalGetType): Throw
an
Modified: trunk/mono/mono/metadata/class.c
===================================================================
--- trunk/mono/mono/metadata/class.c 2007-10-17 21:38:37 UTC (rev 87719)
+++ trunk/mono/mono/metadata/class.c 2007-10-17 21:43:35 UTC (rev 87720)
@@ -4727,6 +4727,7 @@
GHashTable *nspace_table;
MonoImage *loaded_image;
guint32 token = 0;
+ int i;
MonoClass *class;
char *nested;
char buf [1024];
@@ -4764,6 +4765,17 @@
mono_loader_unlock ();
+ if (!token && image->dynamic && image->modules) {
+ /* Search modules as well */
+ for (i = 0; i < image->module_count; ++i) {
+ MonoImage *module = image->modules [i];
+
+ class = mono_class_from_name (module, name_space, name);
+ if (class)
+ return class;
+ }
+ }
+
if (!token)
return NULL;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
