Author: zoltan
Date: 2006-09-10 15:05:40 -0400 (Sun, 10 Sep 2006)
New Revision: 65186
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/object.c
Log:
2006-09-10 Zoltan Varga <[EMAIL PROTECTED]>
* object.c (mono_method_return_message_restore): Avoid a crash if one
of the out
args is not set. Fixes #78926.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2006-09-10 17:39:19 UTC (rev 65185)
+++ trunk/mono/mono/metadata/ChangeLog 2006-09-10 19:05:40 UTC (rev 65186)
@@ -1,3 +1,8 @@
+2006-09-10 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * object.c (mono_method_return_message_restore): Avoid a crash if one
of the out
+ args is not set. Fixes #78926.
+
2006-09-08 Zoltan Varga <[EMAIL PROTECTED]>
* class.c (mono_class_init): Init class->no_special_static_fields from
the cached info.
Modified: trunk/mono/mono/metadata/object.c
===================================================================
--- trunk/mono/mono/metadata/object.c 2006-09-10 17:39:19 UTC (rev 65185)
+++ trunk/mono/mono/metadata/object.c 2006-09-10 19:05:40 UTC (rev 65186)
@@ -3936,8 +3936,14 @@
case MONO_TYPE_R4:
case MONO_TYPE_R8:
case MONO_TYPE_VALUETYPE: {
- size = mono_class_value_size
(((MonoObject*)arg)->vtable->klass, NULL);
- memcpy (*((gpointer *)params [i]), arg + sizeof
(MonoObject), size);
+ if (arg) {
+ size = mono_class_value_size
(((MonoObject*)arg)->vtable->klass, NULL);
+ memcpy (*((gpointer *)params [i]), arg
+ sizeof (MonoObject), size);
+ }
+ else {
+ size = mono_class_value_size
(mono_class_from_mono_type (pt), NULL);
+ memset (*((gpointer *)params [i]), 0,
size);
+ }
break;
}
case MONO_TYPE_STRING:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches