zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed path traversal on POSIX platforms

This commit is contained in:
alexey.lysiuk 2020-01-29 11:41:23 +02:00
parent 93fb98413e
commit 9dd3213393
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/common/searchpaths.cpp
View File

@ -162,7 +162,7 @@ void CollectSubdirectories(TArray<FString> &searchpath, const char *dirmatch)
{ {
findstate_t findstate; findstate_t findstate;
void* handle; void* handle;
if ((handle = I_FindFirst(AbsPath + "/*.*", &findstate)) != (void*)-1) if ((handle = I_FindFirst(AbsPath + "/*", &findstate)) != (void*)-1)
{ {
do do
{ {

3
source/platform/posix/cocoa/i_system.mm
View File

@ -180,6 +180,7 @@ void* I_FindFirst(const char* const filespec, findstate_t* const fileinfo)
{ {
pattern = slash+1; pattern = slash+1;
dir = FString(filespec, slash - filespec + 1); dir = FString(filespec, slash - filespec + 1);
fileinfo->path = dir;
} }
else else
{ {
@ -234,7 +235,7 @@ int I_FindAttr(findstate_t* const fileinfo)
dirent* const ent = fileinfo->namelist[fileinfo->current]; dirent* const ent = fileinfo->namelist[fileinfo->current];
bool isdir; bool isdir;
if (DirEntryExists(ent->d_name, &isdir)) if (DirEntryExists(fileinfo->path + ent->d_name, &isdir))
{ {
return isdir ? FA_DIREC : 0; return isdir ? FA_DIREC : 0;
} }

3
source/platform/posix/i_system.h
View File

@ -73,9 +73,10 @@ bool I_SetCursor(FTexture *);
struct findstate_t struct findstate_t
{ {
private: private:
int count; FString path;
struct dirent **namelist; struct dirent **namelist;
int current; int current;
int count;
friend void *I_FindFirst(const char *filespec, findstate_t *fileinfo); friend void *I_FindFirst(const char *filespec, findstate_t *fileinfo);
friend int I_FindNext(void *handle, findstate_t *fileinfo); friend int I_FindNext(void *handle, findstate_t *fileinfo);

3
source/platform/posix/sdl/i_system.cpp
View File

@ -304,6 +304,7 @@ void *I_FindFirst (const char *filespec, findstate_t *fileinfo)
{ {
pattern = slash+1; pattern = slash+1;
dir = FString(filespec, slash-filespec+1); dir = FString(filespec, slash-filespec+1);
fileinfo->path = dir;
} }
else else
{ {
@ -350,7 +351,7 @@ int I_FindAttr(findstate_t* const fileinfo)
dirent* const ent = fileinfo->namelist[fileinfo->current]; dirent* const ent = fileinfo->namelist[fileinfo->current];
bool isdir; bool isdir;
if (DirEntryExists(ent->d_name, &isdir)) if (DirEntryExists(fileinfo->path + ent->d_name, &isdir))
{ {
return isdir ? FA_DIREC : 0; return isdir ? FA_DIREC : 0;
} }