From fee4b1c32a8cd2d5c62112aa5d62d8f2362b3372 Mon Sep 17 00:00:00 2001 From: goaaats Date: Mon, 20 Jun 2022 18:14:35 +0200 Subject: [PATCH] fix: correctly persist sigged jmp calls --- Dalamud.Injector/GameStart.cs | 4 ++-- Dalamud/Game/SigScanner.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dalamud.Injector/GameStart.cs b/Dalamud.Injector/GameStart.cs index e924fad23..43bf3ea0a 100644 --- a/Dalamud.Injector/GameStart.cs +++ b/Dalamud.Injector/GameStart.cs @@ -155,7 +155,7 @@ namespace Dalamud.Injector } catch (Exception ex) { - Log.Error(ex, "[NativeAclFix] Uncaught error during initialization, trying to kill process"); + Log.Error(ex, "[GameStart] Uncaught error during initialization, trying to kill process"); try { @@ -163,7 +163,7 @@ namespace Dalamud.Injector } catch (Exception killEx) { - Log.Error(killEx, "[NativeAclFix] Could not kill process"); + Log.Error(killEx, "[GameStart] Could not kill process"); } throw; diff --git a/Dalamud/Game/SigScanner.cs b/Dalamud/Game/SigScanner.cs index 700831d51..7064d211e 100644 --- a/Dalamud/Game/SigScanner.cs +++ b/Dalamud/Game/SigScanner.cs @@ -320,7 +320,7 @@ namespace Dalamud.Game var insnByte = Marshal.ReadByte(scanRet); if (insnByte == 0xE8 || insnByte == 0xE9) - return ReadJmpCallSig(scanRet); + scanRet = ReadJmpCallSig(scanRet); this.textCache?.Add(signature, scanRet.ToInt64() - this.Module.BaseAddress.ToInt64());