Fix URLPattern port handling (#1881)

cloudflare · Mar 23, 2024 · e02ae1f · e02ae1f
1 parent bfcfe9a
commit e02ae1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/workerd/api/tests/url-test.js b/src/workerd/api/tests/url-test.js
@@ -9769,3 +9769,12 @@ export const urlPatternFun = {
     }
   }
 };
+
+export const urlPatternPortRegression = {
+  test() {
+    const pattern = new URLPattern({pathname: "/graphql"});
+    const url = new URL("http://localhost:53000/");
+    // Shouldn't match, but also shouldn't throw
+    ok(!pattern.test(url));
+  }
+};
diff --git a/src/workerd/jsg/url.c++ b/src/workerd/jsg/url.c++
@@ -2223,7 +2223,7 @@ UrlPattern::Result<UrlPattern::Init> UrlPattern::processInit(
         result.hostname = kj::str(url.getHostname());
       }
       KJ_IF_SOME(port, chooseStr(kj::mv(init.port), options.port)) {
-        if (port.size() >= 5 || !std::all_of(port.begin(), port.end(), isAsciiDigit)) {
+        if (port.size() > 5 || !std::all_of(port.begin(), port.end(), isAsciiDigit)) {
           return kj::str("Invalid URL port component");
         }
         if (port.size() == 0) {