Author: zoltan
Date: 2005-03-09 11:42:26 -0500 (Wed, 09 Mar 2005)
New Revision: 41605

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/reflection.c
Log:
2005-03-09  Zoltan Varga  <[EMAIL PROTECTED]>

        * reflection.c (mono_get_object_from_blob): Applied patch from
        Ankit Jain ([EMAIL PROTECTED]). Fix enum default values. Fixes #73457.


Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2005-03-09 15:54:02 UTC (rev 41604)
+++ trunk/mono/mono/metadata/ChangeLog  2005-03-09 16:42:26 UTC (rev 41605)
@@ -1,5 +1,8 @@
 2005-03-09  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * reflection.c (mono_get_object_from_blob): Applied patch from
+       Ankit Jain ([EMAIL PROTECTED]). Fix enum default values. Fixes #73457.
+
        * class.c (mono_class_is_assignable_from): Another try at fixing 
        #73469 without breaking anything.
 

Modified: trunk/mono/mono/metadata/reflection.c
===================================================================
--- trunk/mono/mono/metadata/reflection.c       2005-03-09 15:54:02 UTC (rev 
41604)
+++ trunk/mono/mono/metadata/reflection.c       2005-03-09 16:42:26 UTC (rev 
41605)
@@ -5786,6 +5786,7 @@
        void *retval;
        MonoClass *klass;
        MonoObject *object;
+       MonoType *basetype = type;
 
        if (!blob)
                return NULL;
@@ -5794,11 +5795,13 @@
        if (klass->valuetype) {
                object = mono_object_new (domain, klass);
                retval = ((gchar *) object + sizeof (MonoObject));
+               if (klass->enumtype)
+                       basetype = klass->enum_basetype;
        } else {
                retval = &object;
        }
                        
-       if (!mono_get_constant_value_from_blob (domain, type->type,  blob, 
retval))
+       if (!mono_get_constant_value_from_blob (domain, basetype->type,  blob, 
retval))
                return object;
        else
                return NULL;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to