sm-exts/Cleaner
1
0
Fork 0
mirror of https://github.com/accelerator74/Cleaner.git synced 2025-12-07 18:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup offbyone error caused by fgetc incrementing lines at EOF, leading to hangs and crashes

Browse Source
This commit is contained in:
sapphonie 2021-08-26 22:40:52 +00:00
parent e975691c7c
commit ae28a5b983
No known key found for this signature in database
GPG Key ID: 030630A4AE51B91B
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extension.cpp
View File

@ -8,7 +8,7 @@ SMEXT_LINK(&g_Cleaner);
CDetour *g_pDetour = 0; CDetour *g_pDetour = 0;
char ** g_szStrings; char **g_szStrings;
int g_iStrings = 0; int g_iStrings = 0;
#if SOURCE_ENGINE >= SE_LEFT4DEAD2 #if SOURCE_ENGINE >= SE_LEFT4DEAD2
@ -83,7 +83,8 @@ bool Cleaner::SDK_OnLoad(char *error, size_t maxlength, bool late)
rewind(file); rewind(file);
g_szStrings = new char*[lines]; // need lines+1 because the feget runs ++lines even if it's at EOF
g_szStrings = new char*[lines+1];
while (!feof(file)) while (!feof(file))
{ {
@ -170,7 +171,12 @@ void Cleaner::SDK_OnUnload()
g_pDetour = NULL; g_pDetour = NULL;
} }
<<<<<<< HEAD
// we set lines to lines+1 earlier so this needs to be <=
for (int i = 0; i <= g_iStrings; ++i)
=======
for (int i = 0; i < g_iStrings; ++i) for (int i = 0; i < g_iStrings; ++i)
>>>>>>> a8148454bb66da9cd38df0878571524db7a658d6
{ {
delete [] g_szStrings[i]; delete [] g_szStrings[i];
} }