reHLDS/SafeNameAndChat
1
0
Fork 0
mirror of https://github.com/WPMGPRoSToTeMa/SafeNameAndChat.git synced 2025-02-12 06:48:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crash on the latest ReHLDS

Browse Source 
Fixed crashes on some platforms which restore protection (or remove write access) of memory after function (memory) call
This commit is contained in:
Artem Golubikhin 2017-10-09 02:14:29 +00:00
parent e24168d70b
commit 3efaadcb55
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Main.cpp
View File

@ -378,7 +378,13 @@ void Init() {
auto handle = dlopen(dlinfo.dli_fname, RTLD_NOW); auto handle = dlopen(dlinfo.dli_fname, RTLD_NOW);
g_msgBuffer = (decltype(g_msgBuffer))dlsym(handle, "gMsgBuffer"); g_msgBuffer = (decltype(g_msgBuffer))dlsym(handle, "gMsgBuffer");
g_msgType = (decltype(g_msgType))dlsym(handle, "gMsgType"); if (g_msgBuffer != nullptr) {
g_msgType = (decltype(g_msgType))dlsym(handle, "gMsgType");
} else {
uintptr_t addr = FindMemoryByPattern(g_engfuncs.pfnMessageEnd, "F6 05 ?? ?? ?? ?? 02 0F 85 ?? ?? ?? ?? 8B ?? ?? ?? ?? ?? 83 ?? 3A");
g_msgBuffer = decltype(g_msgBuffer)(*(uintptr_t *)(addr + 2) - offsetof(remove_pointer_t<decltype(g_msgBuffer)>, flags));
g_msgType = *(int **)(addr + 15);
}
dlclose(handle); dlclose(handle);
@ -1029,14 +1035,18 @@ void PF_MessageEnd_I() {
DWORD oldProtect; DWORD oldProtect;
VirtualProtect(g_engfuncs.pfnMessageEnd, 5, PAGE_EXECUTE_READWRITE, &oldProtect); VirtualProtect(g_engfuncs.pfnMessageEnd, 5, PAGE_EXECUTE_READWRITE, &oldProtect);
memcpy(g_engfuncs.pfnMessageEnd, g_originalBytes, 5); memcpy(g_engfuncs.pfnMessageEnd, g_originalBytes, 5);
VirtualProtect(g_engfuncs.pfnMessageEnd, 5, oldProtect, &oldProtect);
g_engfuncs.pfnMessageEnd(); g_engfuncs.pfnMessageEnd();
VirtualProtect(g_engfuncs.pfnMessageEnd, 5, PAGE_EXECUTE_READWRITE, &oldProtect);
memcpy(g_engfuncs.pfnMessageEnd, g_patchedBytes, 5); memcpy(g_engfuncs.pfnMessageEnd, g_patchedBytes, 5);
VirtualProtect(g_engfuncs.pfnMessageEnd, 5, oldProtect, &oldProtect); VirtualProtect(g_engfuncs.pfnMessageEnd, 5, oldProtect, &oldProtect);
#else #else
uintptr_t addr = (uintptr_t)g_engfuncs.pfnMessageEnd; uintptr_t addr = (uintptr_t)g_engfuncs.pfnMessageEnd;
mprotect((void*)(addr/PAGESIZE*PAGESIZE), 5 + addr%PAGESIZE, PROT_EXEC | PROT_READ | PROT_WRITE); mprotect((void*)(addr/PAGESIZE*PAGESIZE), 5 + addr%PAGESIZE, PROT_EXEC | PROT_READ | PROT_WRITE);
memcpy((void*)g_engfuncs.pfnMessageEnd, g_originalBytes, 5); memcpy((void*)g_engfuncs.pfnMessageEnd, g_originalBytes, 5);
mprotect((void*)(addr / PAGESIZE*PAGESIZE), 5 + addr%PAGESIZE, PROT_EXEC | PROT_READ);
g_engfuncs.pfnMessageEnd(); g_engfuncs.pfnMessageEnd();
mprotect((void*)(addr / PAGESIZE*PAGESIZE), 5 + addr%PAGESIZE, PROT_EXEC | PROT_READ | PROT_WRITE);
memcpy((void*)g_engfuncs.pfnMessageEnd, g_patchedBytes, 5); memcpy((void*)g_engfuncs.pfnMessageEnd, g_patchedBytes, 5);
mprotect((void*)(addr/PAGESIZE*PAGESIZE), 5 + addr%PAGESIZE, PROT_EXEC | PROT_READ); mprotect((void*)(addr/PAGESIZE*PAGESIZE), 5 + addr%PAGESIZE, PROT_EXEC | PROT_READ);
#endif #endif