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

DeleteDirRecursively: Don't leak the find handle on failure (win32)

Browse source 
Don't close invalid handles.
This commit is contained in:
Henrik Rydgard 2019-01-25 15:12:01 +01:00 • committed by Henrik Rydgård
parent 8aea19434b
commit add5e3c1fa
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Common/FileUtil.cpp
View file

@ -652,7 +652,6 @@ bool DeleteDirRecursively(const std::string &directory)
if (hFind == INVALID_HANDLE_VALUE)
{
FindClose(hFind);
return false;
}
@ -671,7 +670,6 @@ bool DeleteDirRecursively(const std::string &directory)
{
const std::string virtualName = result->d_name;
#endif
// check for "." and ".."
if (((virtualName[0] == '.') && (virtualName[1] == '\0')) ||
((virtualName[0] == '.') && (virtualName[1] == '.') &&
@ -683,10 +681,11 @@ bool DeleteDirRecursively(const std::string &directory)
{
if (!DeleteDirRecursively(newPath))
{
#ifndef _WIN32
#ifndef _WIN32
closedir(dirp);
#endif
#else
FindClose(hFind);
#endif
return false;
}
}
@ -694,10 +693,11 @@ bool DeleteDirRecursively(const std::string &directory)
{
if (!File::Delete(newPath))
{
#ifndef _WIN32
#ifndef _WIN32
closedir(dirp);
#endif
#else
FindClose(hFind);
#endif
return false;
}
}
@ -709,8 +709,7 @@ bool DeleteDirRecursively(const std::string &directory)
}
closedir(dirp);
#endif
File::DeleteDir(directory);
return true;
return File::DeleteDir(directory);
#endif
}