chenx221/Textractor
1
0
Fork 0
forked from Public-Mirror/Textractor
Code Pull Requests Activity

bugfix searchmemory

Browse Source
This commit is contained in:
Akash Mozumdar 2018-09-11 13:40:49 -04:00
parent 2ad278255d
commit 0fe18a43ac
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vnrhook/engine/match.cc
View File

@ -86,8 +86,7 @@ bool DeterminePCEngine()
PcHooks::hookGDIFunctions(); PcHooks::hookGDIFunctions();
PcHooks::hookGDIPlusFunctions(); PcHooks::hookGDIPlusFunctions();
const char check[] = "sdffffffkjldfjlhjweiumxnvq1204tergdmnxcq1111111111111111111111408t03kxjb40"; const char check[] = "sdffffffkjldfjlhjweiumxnvq1204tergdmnxcq1111111111111111111111408t03kxjb40";
__try { Util::SearchMemory((const BYTE*)check, sizeof(check)); } // Not too sure about the stability of this guy Util::SearchMemory((const BYTE*)check, sizeof(check)); // Not too sure about the stability of this guy, so test it here
__except (1) { ConsoleOutput("NextHooker: SearchMemory ERROR (NextHooker will likely still work fine, but please let Artikash know if this happens a lot!)"); }
return false; return false;
} }

28
vnrhook/util/util.cc
View File

@ -284,6 +284,26 @@ bool Util::SearchResourceString(LPCWSTR str)
return false; return false;
} }
namespace
{
DWORD SafeSearchMemory(DWORD startAddr, DWORD endAddr, const BYTE* bytes, unsigned short length)
{
__try
{
for (int i = 0; i < endAddr - startAddr - length; ++i)
for (int j = 0; j <= length; ++j)
if (j == length) return startAddr + i; // not sure about this algorithm...
else if (*((BYTE*)startAddr + i + j) != *(bytes + j) && *(bytes + j) != 0x11) break; // 0x11 = wildcard
}
__except (1)
{
ConsoleOutput("NextHooker: SearchMemory ERROR (NextHooker will likely still work fine, but please let Artikash know if this happens a lot!)");
return 0;
}
return 0;
}
}
DWORD Util::SearchMemory(const BYTE* bytes, unsigned short length, DWORD protect) DWORD Util::SearchMemory(const BYTE* bytes, unsigned short length, DWORD protect)
{ {
std::vector<std::pair<DWORD, DWORD>> validMemory; std::vector<std::pair<DWORD, DWORD>> validMemory;
@ -303,12 +323,8 @@ DWORD Util::SearchMemory(const BYTE* bytes, unsigned short length, DWORD protect
} }
for (auto memory : validMemory) for (auto memory : validMemory)
// Artikash 7/14/2018: not sure, but I think this could throw read access violation if I dont subtract search_length if (DWORD ret = SafeSearchMemory(memory.first, memory.first + memory.second, bytes, length))
for (int i = 0; i < memory.second - length; ++i) return ret;
for (int j = 0; j <= length; ++j)
if (j == length) return memory.first + i; // not sure about this algorithm...
else if (*((BYTE*)memory.first + i + j) != *(bytes + j) && *(bytes + j) != 0x11) break; // 0x11 = wildcard
return 0; return 0;
} }