Fix follow_jmp for 64-bit code - skip REX prefix if found

2016-09-25 18:29:57 -05:00 · 2016-09-25 18:29:57 -05:00 · 27d2229665
parent 869e705549
commit 27d2229665
1 changed files with 5 additions and 4 deletions
--- a/library/VTableInterpose.cpp
+++ b/library/VTableInterpose.cpp
@ -96,12 +96,13 @@ static uint32_t *follow_jmp(void *ptr)
    {
        switch (*p)
        {
-        case 0xE9: // jmp near rel32
 #ifdef DFHACK64
-            p += 5 + *(int32_t*)(p+1) + 1;
-#else
-            p += 5 + *(int32_t*)(p+1);
+        case 0x48: // REX prefix
+            p++;
+            break;
 #endif
+        case 0xE9: // jmp near rel32
+            p += 5 + *(int32_t*)(p+1);
            break;
        case 0xEB: // jmp short rel8
            p += 2 + *(int8_t*)(p+1);