2 files changed, 25 insertions, 0 deletions
diff --git a/libs/usvfs/src/shared/directory_tree.cpp b/libs/usvfs/src/shared/directory_tree.cpp
index 34cc797..33d7ae1 100644
--- a/libs/usvfs/src/shared/directory_tree.cpp
+++ b/libs/usvfs/src/shared/directory_tree.cpp
@@ -34,6 +34,10 @@ fs::path::iterator nextIter(const fs::path::iterator& iter,
 
 void advanceIter(fs::path::iterator& iter, const fs::path::iterator& end)
 {
+  if (iter == end) {
+    return;
+  }
+
   ++iter;
   while (iter != end && (iter->wstring() == L"/" || iter->wstring() == L"\\" ||
                          iter->wstring() == L"."))
diff --git a/libs/usvfs/src/shared/directory_tree.h b/libs/usvfs/src/shared/directory_tree.h
index f82187f..1712071 100644
--- a/libs/usvfs/src/shared/directory_tree.h
+++ b/libs/usvfs/src/shared/directory_tree.h
@@ -327,6 +327,9 @@ public:
   NodePtrT findNode(const fs::path& path)
   {
     fs::path::iterator iter = path.begin();
+    if (iter == path.end()) {
+      return NodePtrT();
+    }
     return findNode(path, iter);
   }
 
@@ -338,6 +341,9 @@ public:
   const NodePtrT findNode(const fs::path& path) const
   {
     fs::path::iterator iter = path.begin();
+    if (iter == path.end()) {
+      return NodePtrT();
+    }
     return findNode(path, iter);
   }
 
@@ -350,6 +356,9 @@ public:
   void visitPath(const fs::path& path, const VisitorFunction& visitor) const
   {
     fs::path::iterator iter = path.begin();
+    if (iter == path.end()) {
+      return;
+    }
     visitPath(path, iter, visitor);
   }
 
@@ -526,6 +535,10 @@ public:
 
   NodePtrT findNode(const fs::path& name, fs::path::iterator& iter)
   {
+    if (iter == name.end()) {
+      return NodePtrT();
+    }
+
     std::string l = iter->string();
     auto subNode  = m_Nodes.find(iter->string());
     advanceIter(iter, name.end());
@@ -548,6 +561,10 @@ public:
 
   const NodePtrT findNode(const fs::path& name, fs::path::iterator& iter) const
   {
+    if (iter == name.end()) {
+      return NodePtrT();
+    }
+
     auto subNode = m_Nodes.find(iter->string());
     advanceIter(iter, name.end());
 
@@ -570,6 +587,10 @@ public:
   void visitPath(const fs::path& path, fs::path::iterator& iter,
                  const VisitorFunction& visitor) const
   {
+    if (iter == path.end()) {
+      return;
+    }
+
     auto subNode = m_Nodes.find(iter->string());
 
     if (subNode != m_Nodes.end()) {