[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.10.8.1-1-2-g86127dc

[Gleb Golubitsky]

The following commit has been merged in the master branch:
commit 52cf3ab003c7ccc340abe9e06cd11e4ed2801107
Author: Zoltan Varga <vargaz at gmail.com>
Date:   Tue Apr 26 13:06:17 2011 +0200

    Modify fixup_cattrs () to handle a corner case where a cattr is created using a MonoCMethod instead of a ConstructorBuilder. Fixes #689533.
    (cherry picked from commit 6bd851a7a3d0f9cf5c0e991397432a17a6cf4526)

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 9f33df1..7c364b0 100644
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -4324,7 +4324,7 @@ fixup_cattrs (MonoDynamicImage *assembly)
 			ctor = mono_g_hash_table_lookup (assembly->tokens, GUINT_TO_POINTER (token));
 			g_assert (ctor);
 
-			if (!strcmp (ctor->vtable->klass->name, "MonoCMethod")) {
+			if (!strcmp (ctor->vtable->klass->name, "MonoCMethod") || !strcmp (ctor->vtable->klass->name, "ConstructorBuilder")) {
 				MonoMethod *m = ((MonoReflectionMethod*)ctor)->method;
 				idx = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->method_to_table_idx, m));
 				values [MONO_CUSTOM_ATTR_TYPE] = (idx << MONO_CUSTOM_ATTR_TYPE_BITS) | MONO_CUSTOM_ATTR_TYPE_METHODDEF;

-- 
mono