<!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>[212048] branches/safari-603-branch</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/212048">212048</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 22:36:02 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211621">r211621</a>. rdar://problem/30221102</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformURLParsercpp">branches/safari-603-branch/Source/WebCore/platform/URLParser.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformURLParserh">branches/safari-603-branch/Source/WebCore/platform/URLParser.h</a></li>
<li><a href="#branchessafari603branchToolsChangeLog">branches/safari-603-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari603branchToolsTestWebKitAPITestsWebCoreURLParsercpp">branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212047 => 212048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-10 06:35:58 UTC (rev 212047)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-10 06:36:02 UTC (rev 212048)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211621. rdar://problem/30221102
+
+ 2017-02-02 Alex Christensen <achristensen@webkit.org>
+
+ URLParser: Fix parsing invalid IPv4 addresses with non-ASCII characters
+ https://bugs.webkit.org/show_bug.cgi?id=167773
+ <rdar://problem/30221102>
+
+ Reviewed by Ryosuke Niwa.
+
+ If an invalid IPv4 address contains the first syntaxViolation (difference between input and canonicalized URL),
+ an iterator is used to calculate how far we have parsed in the input string to copy all the syntax-violation-free
+ characters into a Vector. If a URL contains only ASCII that doesn't contain anything percent-encoded in the host,
+ there is a fast path to parse ASCII hosts. All my existing invalid IPv4 tests followed this path.
+ If there is a non-ASCII character, we need to use an iterator to the original string instead of an iterator
+ to the string after converting the input string's host to ASCII.
+
+ Covered by a new API test which used to RELEASE_ASSERT.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parseIPv4Host):
+ (WebCore::URLParser::parseIPv6Host):
+ (WebCore::URLParser::parseHostAndPort):
+ * platform/URLParser.h:
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211613. rdar://problem/30132707
</span><span class="cx">
</span><span class="cx"> 2017-02-02 Wenson Hsieh <wenson_hsieh@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/URLParser.cpp (212047 => 212048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/URLParser.cpp 2017-02-10 06:35:58 UTC (rev 212047)
+++ branches/safari-603-branch/Source/WebCore/platform/URLParser.cpp 2017-02-10 06:36:02 UTC (rev 212048)
</span><span class="lines">@@ -2203,11 +2203,9 @@
</span><span class="cx"> return values[exponent];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename CharacterType>
-std::optional<URLParser::IPv4Address> URLParser::parseIPv4Host(CodePointIterator<CharacterType> iterator)
</del><ins>+template<typename CharacterTypeForSyntaxViolation, typename CharacterType>
+std::optional<URLParser::IPv4Address> URLParser::parseIPv4Host(const CodePointIterator<CharacterTypeForSyntaxViolation>& iteratorForSyntaxViolationPosition, CodePointIterator<CharacterType> iterator)
</ins><span class="cx"> {
</span><del>- auto hostBegin = iterator;
-
</del><span class="cx"> Vector<uint32_t, 4> items;
</span><span class="cx"> items.reserveInitialCapacity(4);
</span><span class="cx"> bool didSeeSyntaxViolation = false;
</span><span class="lines">@@ -2244,14 +2242,14 @@
</span><span class="cx"> return std::nullopt;
</span><span class="cx">
</span><span class="cx"> if (didSeeSyntaxViolation)
</span><del>- syntaxViolation(hostBegin);
</del><ins>+ syntaxViolation(iteratorForSyntaxViolationPosition);
</ins><span class="cx"> for (auto item : items) {
</span><span class="cx"> if (item > 255)
</span><del>- syntaxViolation(hostBegin);
</del><ins>+ syntaxViolation(iteratorForSyntaxViolationPosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (UNLIKELY(items.size() != 4))
</span><del>- syntaxViolation(hostBegin);
</del><ins>+ syntaxViolation(iteratorForSyntaxViolationPosition);
</ins><span class="cx">
</span><span class="cx"> IPv4Address ipv4 = items.takeLast();
</span><span class="cx"> for (size_t counter = 0; counter < items.size(); ++counter)
</span><span class="lines">@@ -2318,7 +2316,7 @@
</span><span class="cx"> std::optional<URLParser::IPv6Address> URLParser::parseIPv6Host(CodePointIterator<CharacterType> c)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(*c == '[');
</span><del>- auto hostBegin = c;
</del><ins>+ const auto hostBegin = c;
</ins><span class="cx"> advance(c, hostBegin);
</span><span class="cx"> if (c.atEnd())
</span><span class="cx"> return std::nullopt;
</span><span class="lines">@@ -2623,7 +2621,7 @@
</span><span class="cx"> if (isInvalidDomainCharacter(*iterator))
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- if (auto address = parseIPv4Host(CodePointIterator<CharacterType>(hostIterator, iterator))) {
</del><ins>+ if (auto address = parseIPv4Host(hostIterator, CodePointIterator<CharacterType>(hostIterator, iterator))) {
</ins><span class="cx"> serializeIPv4(address.value());
</span><span class="cx"> m_url.m_hostEnd = currentPosition(iterator);
</span><span class="cx"> if (iterator.atEnd()) {
</span><span class="lines">@@ -2648,7 +2646,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto hostBegin = iterator;
</del><ins>+ const auto hostBegin = iterator;
</ins><span class="cx">
</span><span class="cx"> Vector<LChar, defaultInlineBufferSize> utf8Encoded;
</span><span class="cx"> for (; !iterator.atEnd(); ++iterator) {
</span><span class="lines">@@ -2681,7 +2679,7 @@
</span><span class="cx"> Vector<LChar, defaultInlineBufferSize>& asciiDomainValue = asciiDomain.value();
</span><span class="cx"> const LChar* asciiDomainCharacters = asciiDomainValue.data();
</span><span class="cx">
</span><del>- if (auto address = parseIPv4Host(CodePointIterator<LChar>(asciiDomainValue.begin(), asciiDomainValue.end()))) {
</del><ins>+ if (auto address = parseIPv4Host(hostBegin, CodePointIterator<LChar>(asciiDomainValue.begin(), asciiDomainValue.end()))) {
</ins><span class="cx"> serializeIPv4(address.value());
</span><span class="cx"> m_url.m_hostEnd = currentPosition(iterator);
</span><span class="cx"> if (iterator.atEnd()) {
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/URLParser.h (212047 => 212048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/URLParser.h 2017-02-10 06:35:58 UTC (rev 212047)
+++ branches/safari-603-branch/Source/WebCore/platform/URLParser.h 2017-02-10 06:36:02 UTC (rev 212048)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> using IPv4Address = uint32_t;
</span><span class="cx"> void serializeIPv4(IPv4Address);
</span><del>- template<typename CharacterType> std::optional<IPv4Address> parseIPv4Host(CodePointIterator<CharacterType>);
</del><ins>+ template<typename CharacterTypeForSyntaxViolation, typename CharacterType> std::optional<IPv4Address> parseIPv4Host(const CodePointIterator<CharacterTypeForSyntaxViolation>&, CodePointIterator<CharacterType>);
</ins><span class="cx"> template<typename CharacterType> std::optional<uint32_t> parseIPv4Piece(CodePointIterator<CharacterType>&, bool& syntaxViolation);
</span><span class="cx"> using IPv6Address = std::array<uint16_t, 8>;
</span><span class="cx"> template<typename CharacterType> std::optional<IPv6Address> parseIPv6Host(CodePointIterator<CharacterType>);
</span></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (212047 => 212048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog 2017-02-10 06:35:58 UTC (rev 212047)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-02-10 06:36:02 UTC (rev 212048)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211621. rdar://problem/30221102
+
+ 2017-02-02 Alex Christensen <achristensen@webkit.org>
+
+ URLParser: Fix parsing invalid IPv4 addresses with non-ASCII characters
+ https://bugs.webkit.org/show_bug.cgi?id=167773
+ <rdar://problem/30221102>
+
+ Reviewed by Ryosuke Niwa.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211254. rdar://problem/30188490
</span><span class="cx">
</span><span class="cx"> 2017-01-26 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (212047 => 212048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2017-02-10 06:35:58 UTC (rev 212047)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2017-02-10 06:36:02 UTC (rev 212048)
</span><span class="lines">@@ -1264,6 +1264,7 @@
</span><span class="cx"> shouldFail("http://[1234::ab@]");
</span><span class="cx"> shouldFail("http://[1234::ab~]");
</span><span class="cx"> shouldFail("http://[2001::1");
</span><ins>+ shouldFail("http://4:b\xE1");
</ins><span class="cx"> shouldFail("http://[1:2:3:4:5:6:7:8~]/");
</span><span class="cx"> shouldFail("http://[a:b:c:d:e:f:g:127.0.0.1]");
</span><span class="cx"> shouldFail("http://[a:b:c:d:e:f:g:h:127.0.0.1]");
</span></span></pre>
</div>
</div>
</body>
</html>