rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-01-31 20:52:18 +01:00
Code Issues Releases Activity

Replace fscanf with faster parsing #2

Browse Source
This commit is contained in:
KaelaSavia 2023-12-05 17:00:17 +01:00 committed by Nicholas Hastings
parent 62f21ea058
commit f2d9d3e9e5
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/sourcehook/sh_memory.h
View File

@ -262,9 +262,10 @@ namespace SourceHook
{ {
#if SH_SYS == SH_SYS_LINUX #if SH_SYS == SH_SYS_LINUX
// On linux, first check /proc/self/maps // On linux, first check /proc/self/maps
long lower = reinterpret_cast<long>(addr); unsigned long lower = reinterpret_cast<unsigned long>(addr);
long upper = lower + len; unsigned long upper = lower + len;
bool bFound = false;
FILE *pF = fopen("/proc/self/maps", "r"); FILE *pF = fopen("/proc/self/maps", "r");
if (pF) if (pF)
{ {
@ -272,27 +273,23 @@ namespace SourceHook
// Format: // Format:
// lower upper prot stuff path // lower upper prot stuff path
// 08048000-0804c000 r-xp 00000000 03:03 1010107 /bin/cat // 08048000-0804c000 r-xp 00000000 03:03 1010107 /bin/cat
long rlower, rupper; unsigned long rlower, rupper;
while (fscanf(pF, "%lx-%lx", &rlower, &rupper) != EOF) char *buffer = NULL;
{ size_t bufsize = 0;
while (getline(&buffer, &bufsize, pF) != -1) {
char *addr_split;
rlower = strtoul(buffer, &addr_split, 16);
rupper = strtoul(&addr_split[1], NULL, 16);
// Check whether we're IN THERE! // Check whether we're IN THERE!
if (lower >= rlower && upper <= rupper) if (lower >= rlower && upper <= rupper)
{ {
fclose(pF); bFound = true;
return true;
}
// Read to end of line
int c;
while ((c = fgetc(pF)) != '\n')
{
if (c == EOF)
break; break;
} }
if (c == EOF)
break;
} }
free(buffer);
fclose(pF); fclose(pF);
return false; return bFound;
} }
pF = fopen("/proc/curproc/map", "r"); pF = fopen("/proc/curproc/map", "r");
if (pF) if (pF)