MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Filesystem::is* functions handle nonexistent paths properly 

If stat() failed, these functions could read from an uninitialized
stat struct and return "true" for paths that didn't exist.
develop
lethosor 2015-09-19 17:34:58 -04:00
parent 2fcf751a44
commit a56a427d12
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/modules/Filesystem.cpp
Unescape Escape View File

@ -128,18 +128,19 @@ bool Filesystem::exists (std::string path)
_filetype Filesystem::filetype (std::string path) _filetype Filesystem::filetype (std::string path)
{ {
STAT_STRUCT info; STAT_STRUCT info;
Filesystem::stat(path, info); if (!Filesystem::stat(path, info))
return FILETYPE_NONE;
return mode2type(info.st_mode); return mode2type(info.st_mode);
} }
bool Filesystem::isfile (std::string path) bool Filesystem::isfile (std::string path)
{ {
return Filesystem::filetype(path) == FILETYPE_FILE; return Filesystem::exists(path) && Filesystem::filetype(path) == FILETYPE_FILE;
} }
bool Filesystem::isdir (std::string path) bool Filesystem::isdir (std::string path)
{ {
return Filesystem::filetype(path) == FILETYPE_DIRECTORY; return Filesystem::exists(path) && Filesystem::filetype(path) == FILETYPE_DIRECTORY;
} }
#define DEFINE_STAT_TIME_WRAPPER(attr) \ #define DEFINE_STAT_TIME_WRAPPER(attr) \