Fix possible infinite loop in fs::is_sub_path

black-sliver · Dec 27, 2024 · deee075 · deee075
1 parent c495a0f
commit deee075
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/src/core/fs.h b/src/core/fs.h
@@ -240,9 +240,15 @@ namespace  fs {
         while (p != emptyPath) {
             fs::error_code ec;
             if (equivalent(p, root, ec)) {
+                printf("%s == %s\n", p.u8string().c_str(), root.u8string().c_str());
                 return true;
             }
-            p = p.parent_path();
+            printf("%s != %s\n", p.u8string().c_str(), root.u8string().c_str());
+            path parent = p.parent_path();
+            if (parent == p) {
+                break;
+            }
+            p = parent;
         }
         return false;
     }

diff --git a/test/core/test_fs.cpp b/test/core/test_fs.cpp
@@ -26,14 +26,50 @@ TEST(FsTest, U8FourBytes) {
     EXPECT_EQ(fs::u8path(s).u8string(), s);
 }
 
+static fs::path my_realpath(const fs::path& path)
+{
+    fs::path res;
+#if !defined WIN32 && !defined _WIN32
+    char* tmp = realpath(path.c_str(), NULL);
+    if (tmp) {
+        res = tmp;
+        free(tmp);
+    }
+#else
+    auto tmp = _wfullpath(nullptr, path.c_str(), 1024);
+    if (tmp) {
+        auto cmp = [tmp](const fs::path& p) { return wcsicmp(tmp, p.c_str()) == 0; };
+        res = tmp;
+        free(tmp);
+    }
+#endif
+    return res;
+}
+
 TEST(FsTest, SubPath) {
     EXPECT_TRUE(fs::is_sub_path(fs::path("assets") / "icon.png", "assets"));
 }
 
+TEST(FsTest, SubPathAbs) {
+    EXPECT_TRUE(fs::is_sub_path(my_realpath("assets") / "icon.png", "assets"));
+}
+
+TEST(FsTest, SubPathAbsAbs) {
+    EXPECT_TRUE(fs::is_sub_path(my_realpath("assets") / "icon.png", my_realpath("assets")));
+}
+
 TEST(FsTest, NotSubPath) {
     EXPECT_FALSE(fs::is_sub_path(fs::path("assets") / "icon.png", "doc"));
 }
 
+TEST(FsTest, NotSubPathAbs) {
+    EXPECT_FALSE(fs::is_sub_path(my_realpath("assets") / "icon.png", "doc"));
+}
+
+TEST(FsTest, NotSubPathAbsAbs) {
+    EXPECT_FALSE(fs::is_sub_path(my_realpath("assets") / "icon.png", my_realpath("doc")));
+}
+
 TEST(FsTest, IdenticalSubPath) {
     EXPECT_TRUE(fs::is_sub_path(fs::path("assets") / "icon.png", fs::path("assets") / "icon.png"));
 }