reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2024-12-29 08:05:50 +03:00
Code Issues Projects Releases Wiki Activity

Fix IsSafeFileToDownload (thx [WPMG]PRoSToTeM@) (#374)

Browse Source 
Fix nullptr dereferencing in IsSafeFileToDownload.
This commit is contained in:
In-line 2017-02-21 02:18:45 +04:00 committed by Lev
parent a28a401a99
commit 9387422655
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rehlds/engine/sv_main.cpp
View File

@ -7327,7 +7327,10 @@ qboolean IsSafeFileToDownload(const char *filename)
first = Q_strchr(lwrfilename, '.');
#ifdef REHLDS_FIXES
last = Q_strrchr(first, '.');
if(first)
last = Q_strrchr(first, '.');
else
last = nullptr;
#else
last = Q_strrchr(lwrfilename, '.');
#endif
@ -7335,9 +7338,11 @@ qboolean IsSafeFileToDownload(const char *filename)
if (lwrfilename[0] == '/'
|| Q_strstr(lwrfilename, "\\")
|| Q_strstr(lwrfilename, ":")
#ifndef REHLDS_FIXES // Redundant check
|| Q_strstr(lwrfilename, "..")
#endif
|| Q_strstr(lwrfilename, "~")
|| first != last
|| first != last // This and below line make sure that dot count is always equal to one
|| !first
|| Q_strlen(first) != 4
|| Q_strstr(lwrfilename, "halflife.wad")
@ -7353,8 +7358,8 @@ qboolean IsSafeFileToDownload(const char *filename)
|| Q_strcmp(first, ".dll") == 0
|| Q_strcmp(first, ".ini") == 0
|| Q_strcmp(first, ".log") == 0
// || Q_strcmp(lwrfilename, ".so") == 0 // Extension length must be 4 to get here
// || Q_strcmp(lwrfilename, ".dylib") == 0
// || Q_strcmp(first, ".so") == 0 // We can't get here, because of extension length check
// || Q_strcmp(first, ".dylib") == 0
|| Q_strcmp(first, ".sys") == 0)
#else
|| Q_strstr(lwrfilename, ".cfg")