Author: gnorton
Date: 2008-02-11 00:44:55 -0500 (Mon, 11 Feb 2008)
New Revision: 95416
Modified:
branches/mono-1-9/mono/mono/metadata/ChangeLog
branches/mono-1-9/mono/mono/metadata/loader.c
Log:
In .:
2008-02-11 Geoff Norton <[EMAIL PROTECTED]>
* loader.c: [Backport] Guard and dereference against inflated generic
methods. Populate the parameter name for generic parameters as well.
(Fixes #342536)
Modified: branches/mono-1-9/mono/mono/metadata/ChangeLog
===================================================================
--- branches/mono-1-9/mono/mono/metadata/ChangeLog 2008-02-11 05:42:31 UTC
(rev 95415)
+++ branches/mono-1-9/mono/mono/metadata/ChangeLog 2008-02-11 05:44:55 UTC
(rev 95416)
@@ -1,3 +1,9 @@
+2008-02-11 Geoff Norton <[EMAIL PROTECTED]>
+
+ * loader.c: [Backport] Guard and dereference against inflated generic
+ methods. Populate the parameter name for generic parameters as well.
+ (Fixes #342536)
+
2008-01-31 William Holmes <[EMAIL PROTECTED]>
* process.c (process_module_string_read): Check the size returned form
Modified: branches/mono-1-9/mono/mono/metadata/loader.c
===================================================================
--- branches/mono-1-9/mono/mono/metadata/loader.c 2008-02-11 05:42:31 UTC
(rev 95415)
+++ branches/mono-1-9/mono/mono/metadata/loader.c 2008-02-11 05:44:55 UTC
(rev 95416)
@@ -1566,7 +1566,10 @@
for (i = 0; i < mono_method_signature (method)->param_count; ++i)
names [i] = "";
- if (klass->generic_class || klass->rank) /* copy the names later */
+ if (method->is_inflated)
+ method = ((MonoMethodInflated *) method)->declaring;
+
+ if (klass->rank)
return;
mono_class_init (klass);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
