thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure AbstractFilesystemNode::child() only returns a directory in Windows

Browse source 
svn-id: r22306
This commit is contained in:
Travis Howell 2006-05-03 13:06:22 +00:00
parent d84f744e2d
commit e4e7ba1d7a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/fs/windows/windows-fs.cpp
View file

@ -153,7 +153,7 @@ WindowsFilesystemNode::WindowsFilesystemNode(const String &p) {
// Check whether it is a directory, and whether the file actually exists // Check whether it is a directory, and whether the file actually exists
DWORD fileAttribs = GetFileAttributes(toUnicode(_path.c_str())); DWORD fileAttribs = GetFileAttributes(toUnicode(_path.c_str()));
if (fileAttribs == 0xffffffff) { if (fileAttribs == INVALID_FILE_ATTRIBUTES) {
_isValid = false; _isValid = false;
_isDirectory = false; _isDirectory = false;
} else { } else {
@ -239,7 +239,7 @@ AbstractFilesystemNode *WindowsFilesystemNode::child(const String &name) const {
// Check whether the directory actually exists // Check whether the directory actually exists
DWORD fileAttribs = GetFileAttributes(toUnicode(newPath.c_str())); DWORD fileAttribs = GetFileAttributes(toUnicode(newPath.c_str()));
if (fileAttribs == 0xffffffff) if (fileAttribs != FILE_ATTRIBUTE_DIRECTORY || fileAttribs == INVALID_FILE_ATTRIBUTES)
return 0; return 0;
WindowsFilesystemNode *p = new WindowsFilesystemNode(newPath); WindowsFilesystemNode *p = new WindowsFilesystemNode(newPath);