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

e3e2ad4a · Max Kellermann · ace4ba31 · e3e2ad4a
Commit e3e2ad4a authored Feb 12, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CompositeStorage.cxx src/storage/CompositeStorage.cxx +4 -1

No files found.
--- a/src/storage/CompositeStorage.cxx
+++ b/src/storage/CompositeStorage.cxx
@@ -162,10 +162,13 @@ CompositeStorage::Directory::Unmount()
 bool
 CompositeStorage::Directory::Unmount(const char *uri)
 {
+	if (*uri == 0)
+		return Unmount();
+
 	const std::string name = NextSegment(uri);

 	auto i = children.find(name);
-	if (i == children.end() || !i->second.Unmount())
+	if (i == children.end() || !i->second.Unmount(uri))
 		return false;

 	if (i->second.IsEmpty())