LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 16:40:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed love.filesystem.[un]mount

Browse Source 
--HG--
branch : love.filesystem.mount2
This commit is contained in:
Alex Szpakowski
2013-06-22 15:54:53 -03:00
parent bff2c1b5f1
commit b4fa9131d2
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/physfs/Filesystem.cpp
+26 -7
View File
@@ -184,13 +184,22 @@ bool Filesystem::setupWriteDirectory()
bool Filesystem::mount(const char *archive, const char *mountpoint)
{
if (!isInited)
if (!isInited || !archive || !mountpoint)
return false;
if (strstr(archive, "..")) // Not allowed for safety reasons
// Not allowed for safety reasons.
if (strlen(archive) == 0 || strstr(archive, "..") || strcmp(archive, "/") == 0)
return false;
std::string realPath = PHYSFS_getRealDir(archive);
// An empty string or "/" is equivalent to doing PHYSFS_addToSearchPath.
if (strlen(mountpoint) == 0 || strcmp(mountpoint, "/") == 0)
return false;
const char *realDir = PHYSFS_getRealDir(archive);
if (!realDir)
return false;
std::string realPath(realDir);
realPath += LOVE_PATH_SEPARATOR;
realPath += archive;
@@ -199,17 +208,27 @@ bool Filesystem::mount(const char *archive, const char *mountpoint)
bool Filesystem::unmount(const char *archive)
{
if (!isInited)
if (!isInited || !archive)
return false;
if (strstr(archive, "..")) // Not allowed for safety reasons
// Not allowed for safety reasons.
if (strlen(archive) == 0 || strstr(archive, "..") || strcmp(archive, "/") == 0)
return false;
std::string realPath = PHYSFS_getRealDir(archive);
const char *realDir = PHYSFS_getRealDir(archive);
if (!realDir)
return false;
std::string realPath(realDir);
realPath += LOVE_PATH_SEPARATOR;
realPath += archive;
return PHYSFS_removeFromSearchPath(archive);
// Make sure the archive path was previously added with PHYSFS_mount.
const char *mountPoint = PHYSFS_getMountPoint(realPath.c_str());
if (!mountPoint || strcmp(mountPoint, "/") == 0)
return false;
return PHYSFS_removeFromSearchPath(realPath.c_str());
}
File *Filesystem::newFile(const char *filename) const