Rim/iw7-mod
Rim/iw7-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix possible undefined behavior

Browse Source 
Co-Authored-By: fed <58637860+fedddddd@users.noreply.github.com>
This commit is contained in:
quaK 2024-01-09 02:34:34 +02:00
parent 6ca944319b
commit 63dc398ed7
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/client/component/arxan/arxan.cpp
View File

@ -279,20 +279,7 @@ namespace arxan
if (NT_SUCCESS(status)) if (NT_SUCCESS(status))
{ {
if (info_class == ProcessBasicInformation) if (info_class == ProcessDebugObjectHandle)
{
static DWORD explorer_pid = 0;
if (!explorer_pid)
{
auto* const shell_window = GetShellWindow();
GetWindowThreadProcessId(shell_window, &explorer_pid);
}
// InheritedFromUniqueProcessId
static_cast<PPROCESS_BASIC_INFORMATION>(info)->Reserved3 = PVOID(DWORD64(explorer_pid));
}
else if (info_class == ProcessDebugObjectHandle)
{ {
*static_cast<HANDLE*>(info) = nullptr; *static_cast<HANDLE*>(info) = nullptr;
return static_cast<LONG>(0xC0000353); return static_cast<LONG>(0xC0000353);
@ -433,13 +420,12 @@ namespace arxan
{ {
std::unordered_map<PVOID, void*> handle_handler; std::unordered_map<PVOID, void*> handle_handler;
_CONTEXT fake_context{}; void fake_breakpoint_trigger(void* address, _CONTEXT* fake_context)
void fake_breakpoint_trigger(void* address)
{ {
_EXCEPTION_POINTERS fake_info{}; _EXCEPTION_POINTERS fake_info{};
_EXCEPTION_RECORD fake_record{}; _EXCEPTION_RECORD fake_record{};
fake_info.ExceptionRecord = &fake_record; fake_info.ExceptionRecord = &fake_record;
fake_info.ContextRecord = &fake_context; fake_info.ContextRecord = fake_context;
fake_record.ExceptionAddress = reinterpret_cast<void*>(reinterpret_cast<std::uint64_t>(address) + 3); fake_record.ExceptionAddress = reinterpret_cast<void*>(reinterpret_cast<std::uint64_t>(address) + 3);
fake_record.ExceptionCode = EXCEPTION_BREAKPOINT; fake_record.ExceptionCode = EXCEPTION_BREAKPOINT;
@ -451,7 +437,7 @@ namespace arxan
auto result = utils::hook::invoke<LONG>(handler.second, &fake_info); auto result = utils::hook::invoke<LONG>(handler.second, &fake_info);
if (result) if (result)
{ {
memset(&fake_context, 0, sizeof(CONTEXT)); memset(fake_context, 0, sizeof(_CONTEXT));
break; break;
} }
} }
@ -464,15 +450,17 @@ namespace arxan
const auto jump_target = utils::hook::extract<void*>(reinterpret_cast<void*>(game_address + 3)); const auto jump_target = utils::hook::extract<void*>(reinterpret_cast<void*>(game_address + 3));
const auto stub = utils::hook::assemble([address, jump_target](utils::hook::assembler& a) _CONTEXT* fake_context = new _CONTEXT{};
const auto stub = utils::hook::assemble([address, fake_context, jump_target](utils::hook::assembler& a)
{ {
a.push(rcx); a.push(rcx);
a.mov(rcx, &fake_context); a.mov(rcx, fake_context);
a.call_aligned(RtlCaptureContext); a.call_aligned(RtlCaptureContext);
a.pop(rcx); a.pop(rcx);
a.pushad64(); a.pushad64();
a.mov(rcx, address); a.mov(rcx, address);
a.mov(rdx, fake_context);
a.call_aligned(fake_breakpoint_trigger); a.call_aligned(fake_breakpoint_trigger);
a.popad64(); a.popad64();
@ -502,8 +490,6 @@ namespace arxan
} }
once = true; once = true;
memset(&fake_context, 0, sizeof(CONTEXT));
#ifdef PRECOMPUTED_BREAKPOINTS #ifdef PRECOMPUTED_BREAKPOINTS
assert(game::base_address == 0x140000000); assert(game::base_address == 0x140000000);
patch_breakpoints_precomputed(); patch_breakpoints_precomputed();