oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

CompositeStorage: fix tree walk in Directory::Unmount()

Browse Source
This commit is contained in:
Max Kellermann 2014-02-12 23:48:04 +01:00
parent ace4ba3171
commit e3e2ad4ae5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/CompositeStorage.cxx
View File

@ -162,10 +162,13 @@ CompositeStorage::Directory::Unmount()
bool bool
CompositeStorage::Directory::Unmount(const char *uri) CompositeStorage::Directory::Unmount(const char *uri)
{ {
if (*uri == 0)
return Unmount();
const std::string name = NextSegment(uri); const std::string name = NextSegment(uri);
auto i = children.find(name); auto i = children.find(name);
if (i == children.end() || !i->second.Unmount()) if (i == children.end() || !i->second.Unmount(uri))
return false; return false;
if (i->second.IsEmpty()) if (i->second.IsEmpty())