Fixing #935 (#937)

Author: the-moisrex

src/helpers.cpp

@@ -578,15 +578,20 @@ ada_really_inline void parse_prepared_path(std::string_view input,
     // Note: input cannot be empty, it must at least contain one character ('.')
     // Note: we know that '\' is not present.
     if (input[0] != '.') {
-      size_t slashdot = input.find("/.");
-      if (slashdot == std::string_view::npos) {  // common case
-        trivial_path = true;
-      } else {  // uncommon
-        // only three cases matter: /./, /.. or a final /
-        trivial_path =
-            !(slashdot + 2 == input.size() || input[slashdot + 2] == '.' ||
-              input[slashdot + 2] == '/');
+      size_t slashdot = 0;
+      bool dot_is_file = true;
+      for (;;) {
+        slashdot = input.find("/.", slashdot);
+        if (slashdot == std::string_view::npos) {  // common case
+          break;
+        } else {  // uncommon
+          // only three cases matter: /./, /.. or a final /
+          slashdot += 2;
+          dot_is_file &= !(slashdot == input.size() || input[slashdot] == '.' ||
+                           input[slashdot] == '/');
+        }
       }
+      trivial_path = dot_is_file;
     }
   }
   if (trivial_path) {

src/url_aggregator.cpp

@@ -1412,15 +1412,20 @@ inline void url_aggregator::consume_prepared_path(std::string_view input) {
     // Note: input cannot be empty, it must at least contain one character ('.')
     // Note: we know that '\' is not present.
     if (input[0] != '.') {
-      size_t slashdot = input.find("/.");
-      if (slashdot == std::string_view::npos) {  // common case
-        trivial_path = true;
-      } else {  // uncommon
-        // only three cases matter: /./, /.. or a final /
-        trivial_path =
-            !(slashdot + 2 == input.size() || input[slashdot + 2] == '.' ||
-              input[slashdot + 2] == '/');
+      size_t slashdot = 0;
+      bool dot_is_file = true;
+      for (;;) {
+        slashdot = input.find("/.", slashdot);
+        if (slashdot == std::string_view::npos) {  // common case
+          break;
+        } else {  // uncommon
+          // only three cases matter: /./, /.. or a final /
+          slashdot += 2;
+          dot_is_file &= !(slashdot == input.size() || input[slashdot] == '.' ||
+                           input[slashdot] == '/');
+        }
       }
+      trivial_path = dot_is_file;
     }
   }
   if (trivial_path && is_at_path()) {

tests/basic_tests.cpp

@@ -505,3 +505,14 @@ TYPED_TEST(basic_tests, test_possible_asan) {
   ASSERT_EQ(url->get_protocol(), "file:");
   SUCCEED();
 }
+
+TYPED_TEST(basic_tests, test_issue_935) {
+  auto url = ada::parse<TypeParam>("file:///foo/.bar/../baz.js");
+  ASSERT_TRUE(url);
+  ASSERT_EQ(url->get_pathname(), "/foo/baz.js");
+
+  // this should go into the fast path also
+  auto no_dot = ada::parse<TypeParam>("file:///foo/bar/baz.js");
+  ASSERT_EQ(no_dot->get_pathname(), "/foo/bar/baz.js");
+  SUCCEED();
+}