<!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>[245983] 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/245983">245983</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2019-05-31 13:56:40 -0700 (Fri, 31 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>URLParser::parseIPv6Host should properly parse 0's around compression
https://bugs.webkit.org/show_bug.cgi?id=198424

Reviewed by Tim Horton.

Source/WTF:

* wtf/URLParser.cpp:
(WTF::URLParser::parseIPv6Host):

Tools:

* TestWebKitAPI/Tests/WTF/URLParser.cpp:
(TestWebKitAPI::TEST_F):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfURLParsercpp">trunk/Source/WTF/wtf/URLParser.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFURLParsercpp">trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (245982 => 245983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2019-05-31 20:55:25 UTC (rev 245982)
+++ trunk/Source/WTF/ChangeLog  2019-05-31 20:56:40 UTC (rev 245983)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2019-05-31  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><ins>+        URLParser::parseIPv6Host should properly parse 0's around compression
+        https://bugs.webkit.org/show_bug.cgi?id=198424
+
+        Reviewed by Tim Horton.
+
+        * wtf/URLParser.cpp:
+        (WTF::URLParser::parseIPv6Host):
+
+2019-05-31  Alex Christensen  <achristensen@webkit.org>
+
</ins><span class="cx">         URLParser::parseHostAndPort should not allow non-port characters after an ipv6 host
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=198428
</span><span class="cx">         <rdar://problem/51209196>
</span></span></pre></div>
<a id="trunkSourceWTFwtfURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/URLParser.cpp (245982 => 245983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/URLParser.cpp       2019-05-31 20:55:25 UTC (rev 245982)
+++ trunk/Source/WTF/wtf/URLParser.cpp  2019-05-31 20:56:40 UTC (rev 245983)
</span><span class="lines">@@ -2401,6 +2401,8 @@
</span><span class="cx">     IPv6Address address = {{0, 0, 0, 0, 0, 0, 0, 0}};
</span><span class="cx">     size_t piecePointer = 0;
</span><span class="cx">     Optional<size_t> compressPointer;
</span><ins>+    bool previousValueWasZero = false;
+    bool immediatelyAfterCompress = false;
</ins><span class="cx"> 
</span><span class="cx">     if (*c == ':') {
</span><span class="cx">         advance(c, hostBegin);
</span><span class="lines">@@ -2411,6 +2413,7 @@
</span><span class="cx">         advance(c, hostBegin);
</span><span class="cx">         ++piecePointer;
</span><span class="cx">         compressPointer = piecePointer;
</span><ins>+        immediatelyAfterCompress = true;
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     while (!c.atEnd()) {
</span><span class="lines">@@ -2422,6 +2425,9 @@
</span><span class="cx">             advance(c, hostBegin);
</span><span class="cx">             ++piecePointer;
</span><span class="cx">             compressPointer = piecePointer;
</span><ins>+            immediatelyAfterCompress = true;
+            if (previousValueWasZero)
+                syntaxViolation(hostBegin);
</ins><span class="cx">             continue;
</span><span class="cx">         }
</span><span class="cx">         if (piecePointer == 6 || (compressPointer && piecePointer < 6)) {
</span><span class="lines">@@ -2451,7 +2457,8 @@
</span><span class="cx">             advance(c, hostBegin);
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        if (UNLIKELY((value && leadingZeros) || (!value && length > 1)))
</del><ins>+        previousValueWasZero = !value;
+        if (UNLIKELY((value && leadingZeros) || (previousValueWasZero && (length > 1 || immediatelyAfterCompress))))
</ins><span class="cx">             syntaxViolation(hostBegin);
</span><span class="cx"> 
</span><span class="cx">         address[piecePointer++] = value;
</span><span class="lines">@@ -2460,6 +2467,8 @@
</span><span class="cx">         if (piecePointer == 8 || *c != ':')
</span><span class="cx">             return WTF::nullopt;
</span><span class="cx">         advance(c, hostBegin);
</span><ins>+
+        immediatelyAfterCompress = false;
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     if (!c.atEnd())
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (245982 => 245983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-05-31 20:55:25 UTC (rev 245982)
+++ trunk/Tools/ChangeLog       2019-05-31 20:56:40 UTC (rev 245983)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2019-05-31  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><ins>+        URLParser::parseIPv6Host should properly parse 0's around compression
+        https://bugs.webkit.org/show_bug.cgi?id=198424
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WTF/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
+2019-05-31  Alex Christensen  <achristensen@webkit.org>
+
</ins><span class="cx">         URLParser::parseHostAndPort should not allow non-port characters after an ipv6 host
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=198428
</span><span class="cx">         <rdar://problem/51209196>
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp (245982 => 245983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp        2019-05-31 20:55:25 UTC (rev 245982)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp   2019-05-31 20:56:40 UTC (rev 245983)
</span><span class="lines">@@ -230,6 +230,17 @@
</span><span class="cx">     checkURL("about:blank", {"about", "", "", "", 0, "blank", "", "", "about:blank"});
</span><span class="cx">     checkURL("about:blank?query", {"about", "", "", "", 0, "blank", "query", "", "about:blank?query"});
</span><span class="cx">     checkURL("about:blank#fragment", {"about", "", "", "", 0, "blank", "", "fragment", "about:blank#fragment"});
</span><ins>+    checkURL("http://[0::0]/", {"http", "", "", "[::]", 0, "/", "", "", "http://[::]/"});
+    checkURL("http://[0::]/", {"http", "", "", "[::]", 0, "/", "", "", "http://[::]/"});
+    checkURL("http://[::]/", {"http", "", "", "[::]", 0, "/", "", "", "http://[::]/"});
+    checkURL("http://[::0]/", {"http", "", "", "[::]", 0, "/", "", "", "http://[::]/"});
+    checkURL("http://[::0:0]/", {"http", "", "", "[::]", 0, "/", "", "", "http://[::]/"});
+    checkURL("http://[f::0:0]/", {"http", "", "", "[f::]", 0, "/", "", "", "http://[f::]/"});
+    checkURL("http://[f:0::f]/", {"http", "", "", "[f::f]", 0, "/", "", "", "http://[f::f]/"});
+    checkURL("http://[::0:ff]/", {"http", "", "", "[::ff]", 0, "/", "", "", "http://[::ff]/"});
+    checkURL("http://[::00:0:0:0]/", {"http", "", "", "[::]", 0, "/", "", "", "http://[::]/"});
+    checkURL("http://[::0:00:0:0]/", {"http", "", "", "[::]", 0, "/", "", "", "http://[::]/"});
+    checkURL("http://[::0:0.0.0.0]/", {"http", "", "", "[::]", 0, "/", "", "", "http://[::]/"});
</ins><span class="cx">     checkURL("http://[0:f::f:f:0:0]", {"http", "", "", "[0:f::f:f:0:0]", 0, "/", "", "", "http://[0:f::f:f:0:0]/"});
</span><span class="cx">     checkURL("http://[0:f:0:0:f::]", {"http", "", "", "[0:f:0:0:f::]", 0, "/", "", "", "http://[0:f:0:0:f::]/"});
</span><span class="cx">     checkURL("http://[::f:0:0:f:0:0]", {"http", "", "", "[::f:0:0:f:0:0]", 0, "/", "", "", "http://[::f:0:0:f:0:0]/"});
</span><span class="lines">@@ -1228,6 +1239,7 @@
</span><span class="cx">     shouldFail("http://[a:b:c:d:e:f:127.0.-0.1]");
</span><span class="cx">     shouldFail("asdf://space In\aHost");
</span><span class="cx">     shouldFail("asdf://[0:0:0:0:a:b:c:d");
</span><ins>+    shouldFail("http://[::0:0.0.00000.0]/");
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // These are in the spec but not in the web platform tests.
</span></span></pre>
</div>
</div>

</body>
</html>