walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix symlink filtering for enumeration under a virtual mount point.

This commit is contained in:
Ryan C. Gordon 2017-08-14 11:43:18 -04:00
parent cfe3f0180b
commit 8db27a1236
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/physfs.c
View File

@ -2348,6 +2348,7 @@ typedef struct SymlinkFilterData
PHYSFS_EnumerateCallback callback; PHYSFS_EnumerateCallback callback;
void *callbackData; void *callbackData;
DirHandle *dirhandle; DirHandle *dirhandle;
const char *arcfname;
PHYSFS_ErrorCode errcode; PHYSFS_ErrorCode errcode;
} SymlinkFilterData; } SymlinkFilterData;
@ -2357,8 +2358,9 @@ static int enumCallbackFilterSymLinks(void *_data, const char *origdir,
{ {
SymlinkFilterData *data = (SymlinkFilterData *) _data; SymlinkFilterData *data = (SymlinkFilterData *) _data;
const DirHandle *dh = data->dirhandle; const DirHandle *dh = data->dirhandle;
const char *arcfname = data->arcfname;
PHYSFS_Stat statbuf; PHYSFS_Stat statbuf;
const char *trimmedDir = (*origdir == '/') ? (origdir+1) : origdir; const char *trimmedDir = (*arcfname == '/') ? (arcfname + 1) : arcfname;
const size_t slen = strlen(trimmedDir) + strlen(fname) + 2; const size_t slen = strlen(trimmedDir) + strlen(fname) + 2;
char *path = (char *) __PHYSFS_smallAlloc(slen); char *path = (char *) __PHYSFS_smallAlloc(slen);
int retval = 1; int retval = 1;
@ -2434,6 +2436,7 @@ int PHYSFS_enumerate(const char *_fn, PHYSFS_EnumerateCallback cb, void *data)
if ((!allowSymLinks) && (i->funcs->info.supportsSymlinks)) if ((!allowSymLinks) && (i->funcs->info.supportsSymlinks))
{ {
filterdata.dirhandle = i; filterdata.dirhandle = i;
filterdata.arcfname = arcfname;
filterdata.errcode = PHYSFS_ERR_OK; filterdata.errcode = PHYSFS_ERR_OK;
retval = i->funcs->enumerate(i->opaque, arcfname, retval = i->funcs->enumerate(i->opaque, arcfname,
enumCallbackFilterSymLinks, enumCallbackFilterSymLinks,