Skip to content
Permalink
Browse files

Clarify detour creation errors (#1191)

A logic error here meant that it wasn't printing the failing sig name in the common case
  • Loading branch information
SM9CC authored and asherkin committed Feb 26, 2020
1 parent 7da2b89 commit bad0b51ab9bc862db63f452bb138595ac5924bbd
Showing with 16 additions and 13 deletions.
  1. +16 −13 public/CDetour/detours.cpp
@@ -8,7 +8,7 @@
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, version 3.0, as published by the
* Free Software Foundation.
*
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
@@ -182,20 +182,23 @@ bool CDetour::IsEnabled()

bool CDetour::CreateDetour()
{
if (signame && !gameconf->GetMemSig(signame, &detour_address))
{
g_pSM->LogError(myself, "Could not locate %s - Disabling detour", signame);
return false;
}
else if(!detour_address)
if (signame)
{
g_pSM->LogError(myself, "Invalid detour address passed - Disabling detour to prevent crashes");
return false;
}
if (!gameconf->GetMemSig(signame, &detour_address))
{
g_pSM->LogError(myself, "Signature for %s not found in gamedata", signame);
return false;
}

if (!detour_address)
if (!detour_address)
{
g_pSM->LogError(myself, "Sigscan for %s failed", signame);
return false;
}
}
else if (!detour_address)
{
g_pSM->LogError(myself, "Sigscan for %s failed - Disabling detour to prevent crashes", signame);
g_pSM->LogError(myself, "Invalid function address passed for detour");
return false;
}

@@ -209,7 +212,7 @@ bool CDetour::CreateDetour()
JitWriter wr;
JitWriter *jit = ≀
jit_uint32_t CodeSize = 0;

wr.outbase = NULL;
wr.outptr = NULL;

0 comments on commit bad0b51

Please sign in to comment.
You can’t perform that action at this time.