Author: lupus
Date: 2007-11-20 16:47:19 -0500 (Tue, 20 Nov 2007)
New Revision: 90040

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/object.c
Log:


Tue Nov 20 23:10:41 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>

        * object.c: some fields don't have a valid rva: ignore them (bug 
#343083).



Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2007-11-20 21:40:10 UTC (rev 90039)
+++ trunk/mono/mono/metadata/ChangeLog  2007-11-20 21:47:19 UTC (rev 90040)
@@ -1,3 +1,8 @@
+
+Tue Nov 20 23:10:41 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
+
+       * object.c: some fields don't have a valid rva: ignore them (bug 
#343083).
+
 2007-11-20  Martin Baulig  <[EMAIL PROTECTED]>
 
        * mono-debug.h (MONO_DEBUGGER_VERSION): Bump to 65.

Modified: trunk/mono/mono/metadata/object.c
===================================================================
--- trunk/mono/mono/metadata/object.c   2007-11-20 21:40:10 UTC (rev 90039)
+++ trunk/mono/mono/metadata/object.c   2007-11-20 21:47:19 UTC (rev 90040)
@@ -1479,6 +1479,9 @@
                        MonoClass *fklass = mono_class_from_mono_type 
(field->type);
                        g_assert (!(field->type->attrs & 
FIELD_ATTRIBUTE_HAS_DEFAULT));
                        t = (char*)vt->data + field->offset;
+                       /* some fields don't really have rva, they are just 
zeroed (bss? bug #343083) */
+                       if (!field->data)
+                               continue;
                        if (fklass->valuetype) {
                                memcpy (t, field->data, mono_class_value_size 
(fklass, NULL));
                        } else {

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

Reply via email to