2009-04-28 Zoltan Varga <vargaz@gmail.com>

* image.c (mono_image_fixup_vtable): Avoid casting an lvalue. Fixes part of #498692. svn path=/branches/mono-2-4/mono/; revision=132877
baulig · Apr 28, 2009 · 70a3b23 · 70a3b23
1 parent 6203a27
commit 70a3b23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-28  Zoltan Varga  <vargaz@gmail.com>
+
+	* image.c (mono_image_fixup_vtable): Avoid casting an lvalue. Fixes 
+	part of #498692.
+
 2009-04-23 Tom Hindle <tom_hindle@sil.org>
 
 	* cominterop.c (ves_icall_System_Runtime_InteropServices_Marshal_ReleaseComObjectInternal):

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
@@ -1252,12 +1252,12 @@ mono_image_fixup_vtable (MonoImage *image)
 		if (slot_type & VTFIXUP_TYPE_32BIT)
 			while (slot_count--) {
 				*((guint32*) slot) = (guint32) mono_marshal_get_vtfixup_ftnptr (image, *((guint32*) slot), slot_type);
-				((guint32*) slot)++;
+				slot = ((guint32*) slot) + 1;
 			}
 		else if (slot_type & VTFIXUP_TYPE_64BIT)
 			while (slot_count--) {
 				*((guint64*) slot) = (guint64) mono_marshal_get_vtfixup_ftnptr (image, *((guint64*) slot), slot_type);
-				((guint64*) slot)++;
+				slot = ((guint32*) slot) + 1;
 			}
 		else
 			g_assert_not_reached();