2009-02-25 Zoltan Varga <vargaz@gmail.com>

	* tramp-amd64.c (mono_arch_nullify_class_init_trampoline): Pass a non-null
	value to mono_arch_patch_callsite () to fix crashes.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 84fdab4fdf12a674bdecb9f81272700c986b6dcf..dd7d1243b90e15c88441eb78d2c74e99e1848f73 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-25  Zoltan Varga  <vargaz@gmail.com>
 
+       * tramp-amd64.c (mono_arch_nullify_class_init_trampoline): Pass a non-null 
+       value to mono_arch_patch_callsite () to fix crashes.
+       
        * tramp-amd64.c (mono_arch_nullify_class_init_trampoline): Fix a warning.
 
 2009-02-23  Zoltan Varga  <vargaz@gmail.com>

diff --git a/mono/mini/tramp-amd64.c b/mono/mini/tramp-amd64.c
index d871accd09b80f7349cacda5405538ea4eb33095..58c333761dd9e34456b0b5b4b6202d0f5614bde1 100644 (file)
--- a/mono/mini/tramp-amd64.c
+++ b/mono/mini/tramp-amd64.c
@@ -176,7 +176,7 @@ mono_arch_nullify_class_init_trampoline (guint8 *code, gssize *regs)
                buf [4] = 0x90;
                */
 
-               mono_arch_patch_callsite (NULL, code - 2 + 5, nullified_class_init_trampoline);
+               mono_arch_patch_callsite (code - 2, code - 2 + 5, nullified_class_init_trampoline);
        } else if ((code [0] == 0x41) && (code [1] == 0xff)) {
                /* call <REG> */
                /* happens on machines without MAP_32BIT like freebsd */