2010-03-22 Zoltan Varga <vargaz@gmail.com>

	* loader.c (mono_method_get_marshal_info): Fix the handling of dynamic methods
	broken by the last change.

svn path=/trunk/mono/; revision=153972

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index b61f60a83555ec22a605390821a799f4fa7b0dd1..a2baa61e16c256d7eb452d1f0e030026ed1a133d 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-22  Zoltan Varga  <vargaz@gmail.com>
+
+       * loader.c (mono_method_get_marshal_info): Fix the handling of dynamic methods
+       broken by the last change.
+
 2010-03-21  Andreas Färber  <andreas.faerber@web.de>
 
        * socket-io.c: Don't depend on AF_SNA, AF_DECnet,

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index a13e9166ab1c2b0e5e284cb812fdfa2faed3b668..5114695ab71b3ac27f5f743d8b72315b2a3e6983 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -1867,6 +1867,7 @@ mono_method_get_marshal_info (MonoMethod *method, MonoMarshalSpec **mspecs)
                        for (i = 0; i < signature->param_count + 1; ++i)
                                if (dyn_specs [i]) {
                                        mspecs [i] = g_new0 (MonoMarshalSpec, 1);
+                                       memcpy (mspecs [i], dyn_specs [i], sizeof (MonoMarshalSpec));
                                        mspecs [i]->data.custom_data.custom_name = g_strdup (dyn_specs [i]->data.custom_data.custom_name);
                                        mspecs [i]->data.custom_data.cookie = g_strdup (dyn_specs [i]->data.custom_data.cookie);
                                }