+2009-06-14 Zoltan Varga <vargaz@gmail.com>
+
+ * class.c (mono_class_from_name): Fix support for assembly references
+ in the EXPORTEDTYPE table. Fixes #511704.
+
2009-06-13 Geoff Norton <gnorton@novell.com>
* domain.c: Ensure that mono_domain_assembly_open actually opens the
return return_nested_in (class, nested);
return class;
} else if ((impl & MONO_IMPLEMENTATION_MASK) == MONO_IMPLEMENTATION_ASSEMBLYREF) {
- MonoAssembly **references = image->references;
guint32 assembly_idx;
assembly_idx = impl >> MONO_IMPLEMENTATION_BITS;
- if (!references [assembly_idx - 1])
- mono_assembly_load_reference (image, assembly_idx - 1);
- g_assert (references == image->references);
- g_assert (references [assembly_idx - 1]);
- if (references [assembly_idx - 1] == (gpointer)-1)
+ mono_assembly_load_reference (image, assembly_idx - 1);
+ g_assert (image->references [assembly_idx - 1]);
+ if (image->references [assembly_idx - 1] == (gpointer)-1)
return NULL;
else
/* FIXME: Cycle detection */
- return mono_class_from_name (references [assembly_idx - 1]->image, name_space, name);
+ return mono_class_from_name (image->references [assembly_idx - 1]->image, name_space, name);
} else {
g_error ("not yet implemented");
}