<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206614] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206614">206614</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-29 14:20:43 -0700 (Thu, 29 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformURLParsercpp">trunk/Source/WebCore/platform/URLParser.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreURLParsercpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206613 => 206614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-09-29 21:13:33 UTC (rev 206613)
+++ trunk/Source/WebCore/ChangeLog        2016-09-29 21:20:43 UTC (rev 206614)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-09-29 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r206483.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206613 => 206614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp        2016-09-29 21:13:33 UTC (rev 206613)
+++ trunk/Source/WebCore/platform/URLParser.cpp        2016-09-29 21:20:43 UTC (rev 206614)
</span><span class="lines">@@ -2361,6 +2361,9 @@
</span><span class="cx"> syntaxViolation(colonIterator);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+ bool seenDigit = false;
+ bool seenMultipleDigits = false;
+ bool leadingZeros = false;
</ins><span class="cx"> for (; !iterator.atEnd(); ++iterator) {
</span><span class="cx"> if (UNLIKELY(isTabOrNewline(*iterator))) {
</span><span class="cx"> syntaxViolation(colonIterator);
</span><span class="lines">@@ -2367,6 +2370,11 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (isASCIIDigit(*iterator)) {
</span><ins>+ if (*iterator == '0' && !seenDigit)
+ leadingZeros = true;
+ if (seenDigit)
+ seenMultipleDigits = true;
+ seenDigit = true;
</ins><span class="cx"> port = port * 10 + *iterator - '0';
</span><span class="cx"> if (port > std::numeric_limits<uint16_t>::max())
</span><span class="cx"> return false;
</span><span class="lines">@@ -2374,6 +2382,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (port && leadingZeros)
+ syntaxViolation(colonIterator);
+
+ if (!port && seenMultipleDigits)
+ syntaxViolation(colonIterator);
+
</ins><span class="cx"> if (UNLIKELY(isDefaultPort(parsedDataView(0, m_url.m_schemeEnd), port)))
</span><span class="cx"> syntaxViolation(colonIterator);
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206613 => 206614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-09-29 21:13:33 UTC (rev 206613)
+++ trunk/Tools/ChangeLog        2016-09-29 21:20:43 UTC (rev 206614)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-09-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> URLParser: make parsing invalid IPv4 addresses more robust and correct
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162746
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206613 => 206614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp        2016-09-29 21:13:33 UTC (rev 206613)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp        2016-09-29 21:20:43 UTC (rev 206614)
</span><span class="lines">@@ -396,6 +396,7 @@
</span><span class="cx"> checkRelativeURL("://:0/", "http://webkit.org/", {"http", "", "", "webkit.org", 0, "/://:0/", "", "", "http://webkit.org/://:0/"});
</span><span class="cx"> checkRelativeURL(String(), "http://webkit.org/", {"http", "", "", "webkit.org", 0, "/", "", "", "http://webkit.org/"});
</span><span class="cx"> checkRelativeURL("https://@test@test@example:800\\path@end", "http://doesnotmatter/", {"", "", "", "", 0, "", "", "", "https://@test@test@example:800\\path@end"});
</span><ins>+ checkRelativeURL("http://f:0/c", "http://example.org/foo/bar", {"http", "", "", "f", 0, "/c", "", "", "http://f:0/c"});
</ins><span class="cx">
</span><span class="cx"> // The checking of slashes in SpecialAuthoritySlashes needed to get this to pass contradicts what is in the spec,
</span><span class="cx"> // but it is included in the web platform tests.
</span><span class="lines">@@ -766,6 +767,12 @@
</span><span class="cx"> checkURLDifferences("http://127.0.1.~",
</span><span class="cx"> {"http", "", "", "127.0.1.~", 0, "/", "", "", "http://127.0.1.~/"},
</span><span class="cx"> {"", "", "", "", 0, "", "", "", "http://127.0.1.~"});
</span><ins>+ 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"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, DefaultPort)
</span></span></pre>
</div>
</div>
</body>
</html>