<!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>[206649] 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/206649">206649</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-30 11:48:28 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser: parsing a URL with an empty host and a colon should fail
https://bugs.webkit.org/show_bug.cgi?id=162795
Reviewed by Tim Horton.
Source/WebCore:
Covered by new API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parseHostAndPort):
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 (206648 => 206649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-30 18:46:28 UTC (rev 206648)
+++ trunk/Source/WebCore/ChangeLog 2016-09-30 18:48:28 UTC (rev 206649)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-09-30 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ URLParser: parsing a URL with an empty host and a colon should fail
+ https://bugs.webkit.org/show_bug.cgi?id=162795
+
+ Reviewed by Tim Horton.
+
+ Covered by new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parseHostAndPort):
+
+2016-09-30 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> URLParser: handle syntax violations in non-UTF-8 encoded queries
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162770
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206648 => 206649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-30 18:46:28 UTC (rev 206648)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-30 18:48:28 UTC (rev 206649)
</span><span class="lines">@@ -2478,6 +2478,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (iterator.atEnd())
</span><span class="cx"> return false;
</span><ins>+ if (*iterator == ':')
+ return false;
</ins><span class="cx"> if (*iterator == '[') {
</span><span class="cx"> auto ipv6End = iterator;
</span><span class="cx"> while (!ipv6End.atEnd() && *ipv6End != ']')
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206648 => 206649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-30 18:46:28 UTC (rev 206648)
+++ trunk/Tools/ChangeLog 2016-09-30 18:48:28 UTC (rev 206649)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-09-30 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ URLParser: parsing a URL with an empty host and a colon should fail
+ https://bugs.webkit.org/show_bug.cgi?id=162795
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
+2016-09-30 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> URLParser: handle syntax violations in non-UTF-8 encoded queries
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162770
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206648 => 206649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-30 18:46:28 UTC (rev 206648)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-30 18:48:28 UTC (rev 206649)
</span><span class="lines">@@ -292,6 +292,10 @@
</span><span class="cx"> checkURL("http://127.0.0.1", {"http", "", "", "127.0.0.1", 0, "/", "", "", "http://127.0.0.1/"});
</span><span class="cx"> checkURL("http://127.0.0.1.", {"http", "", "", "127.0.0.1.", 0, "/", "", "", "http://127.0.0.1./"});
</span><span class="cx"> checkURL("http://127.0.0.1./", {"http", "", "", "127.0.0.1.", 0, "/", "", "", "http://127.0.0.1./"});
</span><ins>+ checkURL("http://host:123?", {"http", "", "", "host", 123, "/", "", "", "http://host:123/?"});
+ checkURL("http://host:123?query", {"http", "", "", "host", 123, "/", "query", "", "http://host:123/?query"});
+ checkURL("http://host:123#", {"http", "", "", "host", 123, "/", "", "", "http://host:123/#"});
+ checkURL("http://host:123#fragment", {"http", "", "", "host", 123, "/", "", "fragment", "http://host:123/#fragment"});
</ins><span class="cx">
</span><span class="cx"> // This disagrees with the web platform test for http://:@www.example.com but agrees with Chrome and URL::parse,
</span><span class="cx"> // and Firefox fails the web platform test differently. Maybe the web platform test ought to be changed.
</span><span class="lines">@@ -707,6 +711,21 @@
</span><span class="cx"> checkURLDifferences("A://",
</span><span class="cx"> {"a", "", "", "", 0, "/", "", "", "a:///"},
</span><span class="cx"> {"a", "", "", "", 0, "//", "", "", "a://"});
</span><ins>+ checkURLDifferences("http://://",
+ {"", "", "", "", 0, "", "", "", "http://://"},
+ {"http", "", "", "", 0, "//", "", "", "http://://"});
+ checkURLDifferences("http://:123?",
+ {"", "", "", "", 0, "", "", "", "http://:123?"},
+ {"http", "", "", "", 123, "/", "", "", "http://:123/?"});
+ checkURLDifferences("http:/:",
+ {"", "", "", "", 0, "", "", "", "http:/:"},
+ {"http", "", "", "", 0, "/", "", "", "http://:/"});
+ checkURLDifferences("asdf://:",
+ {"", "", "", "", 0, "", "", "", "asdf://:"},
+ {"asdf", "", "", "", 0, "", "", "", "asdf://:"});
+ checkURLDifferences("http://:",
+ {"", "", "", "", 0, "", "", "", "http://:"},
+ {"http", "", "", "", 0, "/", "", "", "http://:/"});
</ins><span class="cx"> checkRelativeURLDifferences("//C|/foo/bar", "file:///tmp/mock/path",
</span><span class="cx"> {"file", "", "", "", 0, "/C:/foo/bar", "", "", "file:///C:/foo/bar"},
</span><span class="cx"> {"", "", "", "", 0, "", "", "", "//C|/foo/bar"});
</span><span class="lines">@@ -885,6 +904,7 @@
</span><span class="cx"> shouldFail(String(), "about:blank");
</span><span class="cx"> shouldFail("http://127.0.0.1:abc");
</span><span class="cx"> shouldFail("http://host:abc");
</span><ins>+ shouldFail("http://:abc");
</ins><span class="cx"> shouldFail("http://a:@", "about:blank");
</span><span class="cx"> shouldFail("http://:b@", "about:blank");
</span><span class="cx"> shouldFail("http://:@", "about:blank");
</span></span></pre>
</div>
</div>
</body>
</html>