Changeset 206614 in webkit

Timestamp:

Sep 29, 2016, 2:20:43 PM (9 years ago)

Author:

achristensen@apple.com

Message:

URLParser should correctly parse ports with leading 0's
​https://bugs.webkit.org/show_bug.cgi?id=162752

Reviewed by Tim Horton.

Source/WebCore:

Covered by new API tests.

• platform/URLParser.cpp:

(WebCore::URLParser::parsePort):

Tools:

• TestWebKitAPI/Tests/WebCore/URLParser.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/URLParser.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-29  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser should correctly parse ports with leading 0's
+        https://bugs.webkit.org/show_bug.cgi?id=162752
+
+        Reviewed by Tim Horton.
+
+        Covered by new API tests.
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::parsePort):
+
 2016-09-29  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -2362 +2362 @@
         return true;
     }
+    bool seenDigit = false;
+    bool seenMultipleDigits = false;
+    bool leadingZeros = false;
     for (; !iterator.atEnd(); ++iterator) {
         if (UNLIKELY(isTabOrNewline(*iterator))) {
@@ -2368 +2371 @@
         }
         if (isASCIIDigit(*iterator)) {
+            if (*iterator == '0' && !seenDigit)
+                leadingZeros = true;
+            if (seenDigit)
+                seenMultipleDigits = true;
+            seenDigit = true;
             port = port * 10 + *iterator - '0';
             if (port > std::numeric_limits<uint16_t>::max())
@@ -2374 +2382 @@
             return false;
     }
+
+    if (port && leadingZeros)
+        syntaxViolation(colonIterator);
+    
+    if (!port && seenMultipleDigits)
+        syntaxViolation(colonIterator);
 
     if (UNLIKELY(isDefaultPort(parsedDataView(0, m_url.m_schemeEnd), port)))

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-29  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser should correctly parse ports with leading 0's
+        https://bugs.webkit.org/show_bug.cgi?id=162752
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2016-09-29  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp

@@ -397 +397 @@
     checkRelativeURL(String(), "http://webkit.org/", {"http", "", "", "webkit.org", 0, "/", "", "", "http://webkit.org/"});
     checkRelativeURL("https://@test@test@example:800\\path@end", "http://doesnotmatter/", {"", "", "", "", 0, "", "", "", "https://@test@test@example:800\\path@end"});
+    checkRelativeURL("http://f:0/c", "http://example.org/foo/bar", {"http", "", "", "f", 0, "/c", "", "", "http://f:0/c"});
 
     // The checking of slashes in SpecialAuthoritySlashes needed to get this to pass contradicts what is in the spec,
@@ -767 +768 @@
         {"http", "", "", "127.0.1.~", 0, "/", "", "", "http://127.0.1.~/"},
         {"", "", "", "", 0, "", "", "", "http://127.0.1.~"});
+    checkRelativeURLDifferences("http://f:000/c", "http://example.org/foo/bar",
+        {"http", "", "", "f", 0, "/c", "", "", "http://f:0/c"},
+        {"http", "", "", "f", 0, "/c", "", "", "http://f:000/c"});
+    checkRelativeURLDifferences("http://f:010/c", "http://example.org/foo/bar",
+        {"http", "", "", "f", 10, "/c", "", "", "http://f:10/c"},
+        {"http", "", "", "f", 10, "/c", "", "", "http://f:010/c"});
 }