Author: raja
Date: 2007-06-11 13:07:03 -0400 (Mon, 11 Jun 2007)
New Revision: 79193
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/class.c
Log:
* class.c (mono_class_from_generic_parameter): Fix case similar to
bug #81830 handled below, but for method containers.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-06-11 16:57:37 UTC (rev 79192)
+++ trunk/mono/mono/metadata/ChangeLog 2007-06-11 17:07:03 UTC (rev 79193)
@@ -1,3 +1,8 @@
+2007-06-11 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * class.c (mono_class_from_generic_parameter): Fix case similar to
+ bug #81830 handled below, but for method containers.
+
2007-06-10 Raja R Harinath <[EMAIL PROTECTED]>
* class.c (inflate_generic_type) [MONO_TYPE_CLASS]: Don't call
Modified: trunk/mono/mono/metadata/class.c
===================================================================
--- trunk/mono/mono/metadata/class.c 2007-06-11 16:57:37 UTC (rev 79192)
+++ trunk/mono/mono/metadata/class.c 2007-06-11 17:07:03 UTC (rev 79193)
@@ -3263,7 +3263,7 @@
if (!image && param->owner) {
if (is_mvar) {
MonoMethod *method = param->owner->owner.method;
- image = method->klass ? method->klass->image : NULL;
+ image = (method && method->klass) ?
method->klass->image : NULL;
} else {
MonoClass *klass = param->owner->owner.klass;
// FIXME: 'klass' should not be null
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
