Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed cstrike module crash on OS X (r=dvander).

Browse Source 
Valve now compiles OS X binaries with -fvisibility=hidden, so dlsym no longer works with non-exported symbols.


Former-commit-id: f77f6430a288cbe1200bae05c64494f6a0030bc6
This commit is contained in:
Scott Ehlert 2013-09-03 17:56:27 -05:00
parent 87d2a54638
commit 2a458530b7
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/cstrike/cstrike/CstrikeHacks.cpp
View File

@ -11,11 +11,15 @@
#endif #endif
#endif #endif
#if defined(__APPLE__)
#include <mach-o/nlist.h>
#endif
/* Utils */ /* Utils */
unsigned char *UTIL_CodeAlloc(size_t size); unsigned char *UTIL_CodeAlloc(size_t size);
void UTIL_CodeFree(unsigned char *addr); void UTIL_CodeFree(unsigned char *addr);
void UTIL_MemProtect(void *addr, int length, int prot); void UTIL_MemProtect(void *addr, int length, int prot);
bool UTIL_GetLibraryOfAddress(void *memInBase, char *buffer, size_t maxlength); bool UTIL_GetLibraryOfAddress(void *memInBase, char *buffer, size_t maxlength, uintptr_t *base);
/* Detours */ /* Detours */
void CtrlDetour_ClientCommand(bool set); void CtrlDetour_ClientCommand(bool set);
@ -72,10 +76,12 @@ void CtrlDetour_ClientCommand(bool set)
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
/* Find the DLL */ /* Find the DLL */
char dll[256]; char dll[256];
if (!UTIL_GetLibraryOfAddress(target, dll, sizeof(dll))) uintptr_t base;
if (!UTIL_GetLibraryOfAddress(target, dll, sizeof(dll), &base))
{ {
return; return;
} }
#if defined(__linux__)
void *handle = dlopen(dll, RTLD_NOW); void *handle = dlopen(dll, RTLD_NOW);
if (!handle) if (!handle)
{ {
@ -84,7 +90,20 @@ void CtrlDetour_ClientCommand(bool set)
g_UseBotArgs = (int *)dlsym(handle, "UseBotArgs"); g_UseBotArgs = (int *)dlsym(handle, "UseBotArgs");
g_BotArgs = (const char **)dlsym(handle, "BotArgs"); g_BotArgs = (const char **)dlsym(handle, "BotArgs");
dlclose(handle); dlclose(handle);
#else #elif defined(__APPLE__)
/* Using dlsym on OS X won't work because the symbols are hidden */
struct nlist symbols[3];
memset(symbols, 0, sizeof(symbols));
symbols[0].n_un.n_name = (char *)"_UseBotArgs";
symbols[1].n_un.n_name = (char *)"_BotArgs";
if (nlist(dll, symbols) != 0)
{
return;
}
g_UseBotArgs = (int *)(base + symbols[0].n_value);
g_BotArgs = (const char **)(base + symbols[1].n_value);
#endif
#else /* Windows */
/* Find the bot args addresses */ /* Find the bot args addresses */
paddr = (unsigned char *)target + CS_CLICMD_OFFS_USEBOTARGS; paddr = (unsigned char *)target + CS_CLICMD_OFFS_USEBOTARGS;
g_UseBotArgs = *(int **)paddr; g_UseBotArgs = *(int **)paddr;
@ -178,7 +197,7 @@ void UTIL_MemProtect(void *addr, int length, int prot)
#endif #endif
} }
bool UTIL_GetLibraryOfAddress(void *memInBase, char *buffer, size_t maxlength) bool UTIL_GetLibraryOfAddress(void *memInBase, char *buffer, size_t maxlength, uintptr_t *base)
{ {
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
Dl_info info; Dl_info info;
@ -192,6 +211,10 @@ bool UTIL_GetLibraryOfAddress(void *memInBase, char *buffer, size_t maxlength)
} }
const char *dllpath = info.dli_fname; const char *dllpath = info.dli_fname;
snprintf(buffer, maxlength, "%s", dllpath); snprintf(buffer, maxlength, "%s", dllpath);
if (base)
{
*base = (uintptr_t)info.dli_fbase;
}
#else #else
MEMORY_BASIC_INFORMATION mem; MEMORY_BASIC_INFORMATION mem;
if (!VirtualQuery(memInBase, &mem, sizeof(mem))) if (!VirtualQuery(memInBase, &mem, sizeof(mem)))
@ -204,6 +227,10 @@ bool UTIL_GetLibraryOfAddress(void *memInBase, char *buffer, size_t maxlength)
} }
HMODULE dll = (HMODULE)mem.AllocationBase; HMODULE dll = (HMODULE)mem.AllocationBase;
GetModuleFileName(dll, (LPTSTR)buffer, maxlength); GetModuleFileName(dll, (LPTSTR)buffer, maxlength);
if (base)
{
*base = (uintptr_t)mem.AllocationBase;
}
#endif #endif
return true; return true;
} }