<!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>[206617] 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/206617">206617</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-29 15:02:04 -0700 (Thu, 29 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix syntax violation handling in IPv4 address parsing
https://bugs.webkit.org/show_bug.cgi?id=162756
Reviewed by Tim Horton.
Source/WebCore:
When we are parsing the up to 4 numbers in an IPv4 address, if we find a syntax violation
(the canonicalized address would be different than the input string) then wait to report
it until we have determined that this is a valid IPv4 address that will be canonicalized.
If it is not a valid IPv4 address, then we will just treat the characters as the host, and
that could be no syntax violation.
Covered by a new API test and existing API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::URLParser):
(WebCore::URLParser::parseIPv4Number):
(WebCore::URLParser::parseIPv4Host):
* platform/URLParser.h:
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="#trunkSourceWebCoreplatformURLParserh">trunk/Source/WebCore/platform/URLParser.h</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 (206616 => 206617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-29 21:28:45 UTC (rev 206616)
+++ trunk/Source/WebCore/ChangeLog 2016-09-29 22:02:04 UTC (rev 206617)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-09-29 Alex Christensen <achristensen@webkit.org>
+
+ Fix syntax violation handling in IPv4 address parsing
+ https://bugs.webkit.org/show_bug.cgi?id=162756
+
+ Reviewed by Tim Horton.
+
+ When we are parsing the up to 4 numbers in an IPv4 address, if we find a syntax violation
+ (the canonicalized address would be different than the input string) then wait to report
+ it until we have determined that this is a valid IPv4 address that will be canonicalized.
+ If it is not a valid IPv4 address, then we will just treat the characters as the host, and
+ that could be no syntax violation.
+
+ Covered by a new API test and existing API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::URLParser):
+ (WebCore::URLParser::parseIPv4Number):
+ (WebCore::URLParser::parseIPv4Host):
+ * platform/URLParser.h:
+
</ins><span class="cx"> 2016-09-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix post-landing nits after r206561.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206616 => 206617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-29 21:28:45 UTC (rev 206616)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-29 22:02:04 UTC (rev 206617)
</span><span class="lines">@@ -2027,7 +2027,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-Optional<uint32_t> URLParser::parseIPv4Number(CodePointIterator<CharacterType>& iterator, const CodePointIterator<CharacterType>& iteratorForSyntaxViolationPosition)
</del><ins>+Optional<uint32_t> URLParser::parseIPv4Number(CodePointIterator<CharacterType>& iterator, bool& didSeeSyntaxViolation)
</ins><span class="cx"> {
</span><span class="cx"> enum class State : uint8_t {
</span><span class="cx"> UnknownBase,
</span><span class="lines">@@ -2040,7 +2040,6 @@
</span><span class="cx"> Checked<uint32_t, RecordOverflow> value = 0;
</span><span class="cx"> if (!iterator.atEnd() && *iterator == '.')
</span><span class="cx"> return Nullopt;
</span><del>- bool didSeeSyntaxViolation = false;
</del><span class="cx"> while (!iterator.atEnd()) {
</span><span class="cx"> if (*iterator == '.') {
</span><span class="cx"> ASSERT(!value.hasOverflowed());
</span><span class="lines">@@ -2095,8 +2094,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (didSeeSyntaxViolation)
- syntaxViolation(iteratorForSyntaxViolationPosition);
</del><span class="cx"> ASSERT(!value.hasOverflowed());
</span><span class="cx"> return value.unsafeGet();
</span><span class="cx"> }
</span><span class="lines">@@ -2115,10 +2112,11 @@
</span><span class="cx">
</span><span class="cx"> Vector<uint32_t, 4> items;
</span><span class="cx"> items.reserveInitialCapacity(4);
</span><ins>+ bool didSeeSyntaxViolation = false;
</ins><span class="cx"> while (!iterator.atEnd()) {
</span><span class="cx"> if (items.size() >= 4)
</span><span class="cx"> return Nullopt;
</span><del>- if (auto item = parseIPv4Number(iterator, hostBegin))
</del><ins>+ if (auto item = parseIPv4Number(iterator, didSeeSyntaxViolation))
</ins><span class="cx"> items.append(item.value());
</span><span class="cx"> else
</span><span class="cx"> return Nullopt;
</span><span class="lines">@@ -2141,6 +2139,9 @@
</span><span class="cx"> }
</span><span class="cx"> if (items[items.size() - 1] >= pow256(5 - items.size()))
</span><span class="cx"> return Nullopt;
</span><ins>+
+ if (didSeeSyntaxViolation)
+ syntaxViolation(hostBegin);
</ins><span class="cx"> for (auto item : items) {
</span><span class="cx"> if (item > 255)
</span><span class="cx"> syntaxViolation(hostBegin);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (206616 => 206617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2016-09-29 21:28:45 UTC (rev 206616)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-09-29 22:02:04 UTC (rev 206617)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> using IPv4Address = uint32_t;
</span><span class="cx"> void serializeIPv4(IPv4Address);
</span><span class="cx"> template<typename CharacterType> Optional<IPv4Address> parseIPv4Host(CodePointIterator<CharacterType>);
</span><del>- template<typename CharacterType> Optional<uint32_t> parseIPv4Number(CodePointIterator<CharacterType>&, const CodePointIterator<CharacterType>& iteratorForSyntaxViolationPosition);
</del><ins>+ template<typename CharacterType> Optional<uint32_t> parseIPv4Number(CodePointIterator<CharacterType>&, bool& syntaxViolation);
</ins><span class="cx"> using IPv6Address = std::array<uint16_t, 8>;
</span><span class="cx"> template<typename CharacterType> Optional<IPv6Address> parseIPv6Host(CodePointIterator<CharacterType>);
</span><span class="cx"> void serializeIPv6Piece(uint16_t piece);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206616 => 206617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-29 21:28:45 UTC (rev 206616)
+++ trunk/Tools/ChangeLog 2016-09-29 22:02:04 UTC (rev 206617)
</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>+ Fix syntax violation handling in IPv4 address parsing
+ https://bugs.webkit.org/show_bug.cgi?id=162756
+
+ 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 should correctly parse ports with leading 0's
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162752
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206616 => 206617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-29 21:28:45 UTC (rev 206616)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-29 22:02:04 UTC (rev 206617)
</span><span class="lines">@@ -773,6 +773,7 @@
</span><span class="cx"> checkRelativeURLDifferences("http://f:010/c", "http://example.org/foo/bar",
</span><span class="cx"> {"http", "", "", "f", 10, "/c", "", "", "http://f:10/c"},
</span><span class="cx"> {"http", "", "", "f", 10, "/c", "", "", "http://f:010/c"});
</span><ins>+ checkURL("http://0.0.0.0x100/", {"http", "", "", "0.0.0.0x100", 0, "/", "", "", "http://0.0.0.0x100/"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, DefaultPort)
</span></span></pre>
</div>
</div>
</body>
</html>