Merged revisions 8187-8244 via svnmerge from

[cacao.git] / src / vm / jit / m68k / md.c

diff --git a/src/vm/jit/m68k/md.c b/src/vm/jit/m68k/md.c
index 7b6371ba7a036b7886e4408a3d0506f05baa1dfb..c9759b52c26efcfb3d25a67df6dda578b4060c2d 100644 (file)
--- a/src/vm/jit/m68k/md.c
+++ b/src/vm/jit/m68k/md.c
@@ -124,6 +124,12 @@ u1* md_get_method_patch_address(u1 *ra, stackframeinfo *sfi, u1 *mptr)
                        /* found an invokevirtual */
                        /* get offset of load instruction 246b XXXX */
                        offset = *((s2*)(ra - 4));
+
+                       /* return NULL if no mptr was specified (used for replacement) */
+
+                       if (mptr == NULL)
+                               return NULL;
+
                        pa = mptr + offset;                     /* mptr contains the magic we want */
                } else  {
                        /* we had a moveal XXX, %a3 which is a 3 word opcode */