Skip to content

Commit

Permalink
Assert directory exists before iterating on its content
Browse files Browse the repository at this point in the history
  • Loading branch information
jmmuller committed Jan 25, 2024
1 parent c5d67f3 commit f76c669
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions MMVII/src/Utils/uti_string.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ void MakeBckUp(const std::string & aDir,const std::string & aNameFile,int aNbDi

void GetFilesFromDir(std::vector<std::string> & aRes,const std::string & aDir,const tNameSelector & aNS,bool OnlyRegular)
{
MMVII_INTERNAL_ASSERT_User(IsDirectory(aDir), eTyUEr::eOpenFile, aDir+" is not a directory!");
for (fs::directory_iterator itr(aDir); itr!=fs::directory_iterator(); ++itr)
{
std::string aName ( itr->path().filename().generic_string().c_str());
Expand Down Expand Up @@ -618,6 +619,7 @@ std::vector<std::string> GetSubDirFromDir(const std::string & aDir,const tNameSe
*/
void RecGetFilesFromDir( std::vector<std::string> & aRes, const std::string & aDir,tNameSelector aNS,int aLevMin, int aLevMax)
{
MMVII_INTERNAL_ASSERT_User(IsDirectory(aDir), eTyUEr::eOpenFile, aDir+" is not a directory!");
for (fs::recursive_directory_iterator itr(aDir); itr!=fs::recursive_directory_iterator(); ++itr)
{
int aLev = itr.depth();
Expand Down

0 comments on commit f76c669

Please sign in to comment.