2002-09-24 Nick Drochak <ndrochak@gol.com>

	* icall.c (ves_icall_System_Enum_ToObject): validate the type parameter
	before using it in case it is null.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index a9ec1bb93b9fd18e9e9fcc3c34a2c29974ee48eb..a8b166f9fae7ae2f21bfe9802770b3fc6d4ff8c8 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,4 +1,8 @@
+2002-09-24  Nick Drochak <ndrochak@gol.com>
 
+       * icall.c (ves_icall_System_Enum_ToObject): validate the type parameter
+       before using it in case it is null.
+       
 Tue Sep 24 13:24:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
 
        * metadata.c: allow custom modifiers in local var signatures

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 6354e85846a48f3f371268586a2a41832ef5f0cf..6daa33829bae0fda23028ccc4b81bae004e77419 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -1270,7 +1270,7 @@ ves_icall_InternalExecute (MonoReflectionMethod *method, MonoObject *this, MonoA
 static MonoObject *
 ves_icall_System_Enum_ToObject (MonoReflectionType *type, MonoObject *obj)
 {
-       MonoDomain *domain = mono_object_domain (type); 
+       MonoDomain *domain; 
        MonoClass *enumc, *objc;
        gint32 s1, s2;
        MonoObject *res;
@@ -1278,6 +1278,7 @@ ves_icall_System_Enum_ToObject (MonoReflectionType *type, MonoObject *obj)
        MONO_CHECK_ARG_NULL (type);
        MONO_CHECK_ARG_NULL (obj);
 
+       domain = mono_object_domain (type); 
        enumc = mono_class_from_mono_type (type->type);
        objc = obj->vtable->klass;