generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 17:30:44 +02:00
Code Issues Projects Releases Wiki Activity

fixed GH# 236: Bug in RecursiveDirectoryIterator

Browse Source
This commit is contained in:
Guenter Obiltschnig
2013-07-18 17:28:16 +02:00
parent f7bc7272ad
commit 996ddf1b43
6 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Foundation/src/DirectoryIteratorStrategy.cpp
View File

@@ -55,6 +55,19 @@ inline bool TraverseBase::isFiniteDepth()
}
bool TraverseBase::isDirectory(Poco::File& file)
{
try
{
return file.isDirectory();
}
catch (...)
{
return false;
}
}
//
// ChildrenFirstTraverse
//
@@ -77,7 +90,7 @@ const std::string ChildrenFirstTraverse::next(Stack* itStack, bool* isFinished)
// go deeper into not empty directory
// (if depth limit allows)
bool isDepthLimitReached = isFiniteDepth() && _depthDeterminer(*itStack) >= _maxDepth;
if (!isDepthLimitReached && itStack->top()->isDirectory())
if (!isDepthLimitReached && isDirectory(*itStack->top()))
{
DirectoryIterator child_it(itStack->top().path());
// check if directory is empty
@@ -130,7 +143,7 @@ const std::string SiblingsFirstTraverse::next(Stack* itStack, bool* isFinished)
// add dirs to queue (if depth limit allows)
bool isDepthLimitReached = isFiniteDepth() && _depthDeterminer(*itStack) >= _maxDepth;
if (!isDepthLimitReached && itStack->top()->isDirectory())
if (!isDepthLimitReached && isDirectory(*itStack->top()))
{
const std::string& p = itStack->top()->path();
_dirsStack.top().push(p);