<!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>[206735] 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/206735">206735</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-10-03 10:28:04 -0700 (Mon, 03 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser: empty relative URLs should not copy fragment from the base URL
https://bugs.webkit.org/show_bug.cgi?id=162864
Reviewed by Chris Dumez.
Source/WebCore:
Covered by new API tests.
* platform/URL.cpp:
(WebCore::URL::removeFragmentIdentifier):
Optimize removing fragments, now that it happens more often. We don't need to reparse,
because the result will always be equal to just a substring when removing the fragment at the end.
* platform/URLParser.cpp:
(WebCore::URLParser::copyASCIIStringUntil):
(WebCore::URLParser::copyURLPartsUntil):
(WebCore::containsOnlyC0ControlOrSpace):
(WebCore::URLParser::URLParser):
(WebCore::URLParser::parse):
* platform/URLParser.h:
Because we are not copying the fragment, we can simplify and remove some unreachable code.
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="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</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 (206734 => 206735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-03 16:43:03 UTC (rev 206734)
+++ trunk/Source/WebCore/ChangeLog 2016-10-03 17:28:04 UTC (rev 206735)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-03 Alex Christensen <achristensen@webkit.org>
+
+ URLParser: empty relative URLs should not copy fragment from the base URL
+ https://bugs.webkit.org/show_bug.cgi?id=162864
+
+ Reviewed by Chris Dumez.
+
+ Covered by new API tests.
+
+ * platform/URL.cpp:
+ (WebCore::URL::removeFragmentIdentifier):
+ Optimize removing fragments, now that it happens more often. We don't need to reparse,
+ because the result will always be equal to just a substring when removing the fragment at the end.
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::copyASCIIStringUntil):
+ (WebCore::URLParser::copyURLPartsUntil):
+ (WebCore::containsOnlyC0ControlOrSpace):
+ (WebCore::URLParser::URLParser):
+ (WebCore::URLParser::parse):
+ * platform/URLParser.h:
+ Because we are not copying the fragment, we can simplify and remove some unreachable code.
+
</ins><span class="cx"> 2016-10-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> td.scope should only return known values
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (206734 => 206735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2016-10-03 16:43:03 UTC (rev 206734)
+++ trunk/Source/WebCore/platform/URL.cpp 2016-10-03 17:28:04 UTC (rev 206735)
</span><span class="lines">@@ -1106,14 +1106,14 @@
</span><span class="cx">
</span><span class="cx"> void URL::removeFragmentIdentifier()
</span><span class="cx"> {
</span><del>- if (!m_isValid)
</del><ins>+ if (!m_isValid) {
+ ASSERT(!m_fragmentEnd);
+ ASSERT(!m_queryEnd);
</ins><span class="cx"> return;
</span><del>- if (URLParser::enabled()) {
- // FIXME: We shouldn't need to parse here.
- URLParser parser(m_string.left(m_queryEnd));
- *this = parser.result();
- } else
- parse(m_string.left(m_queryEnd));
</del><ins>+ }
+ if (m_fragmentEnd > m_queryEnd)
+ m_string = m_string.left(m_queryEnd);
+ m_fragmentEnd = m_queryEnd;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void URL::setQuery(const String& query)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206734 => 206735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-10-03 16:43:03 UTC (rev 206734)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-10-03 17:28:04 UTC (rev 206735)
</span><span class="lines">@@ -758,21 +758,17 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void URLParser::copyASCIIStringUntil(const String& string, size_t lengthIf8Bit, size_t lengthIf16Bit)
</del><ins>+void URLParser::copyASCIIStringUntil(const String& string, size_t length)
</ins><span class="cx"> {
</span><del>- if (string.isNull()) {
- ASSERT(!lengthIf8Bit);
- ASSERT(!lengthIf16Bit);
</del><ins>+ RELEASE_ASSERT(length <= string.length());
+ if (string.isNull())
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx"> ASSERT(m_asciiBuffer.isEmpty());
</span><span class="cx"> if (string.is8Bit()) {
</span><del>- RELEASE_ASSERT(lengthIf8Bit <= string.length());
- appendToASCIIBuffer(string.characters8(), lengthIf8Bit);
</del><ins>+ appendToASCIIBuffer(string.characters8(), length);
</ins><span class="cx"> } else {
</span><del>- RELEASE_ASSERT(lengthIf16Bit <= string.length());
</del><span class="cx"> const UChar* characters = string.characters16();
</span><del>- for (size_t i = 0; i < lengthIf16Bit; ++i) {
</del><ins>+ for (size_t i = 0; i < length; ++i) {
</ins><span class="cx"> UChar c = characters[i];
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(isASCII(c));
</span><span class="cx"> appendToASCIIBuffer(c);
</span><span class="lines">@@ -787,28 +783,10 @@
</span><span class="cx">
</span><span class="cx"> m_asciiBuffer.clear();
</span><span class="cx"> m_unicodeFragmentBuffer.clear();
</span><del>- if (part == URLPart::FragmentEnd) {
- copyASCIIStringUntil(base.m_string, urlLengthUntilPart(base, URLPart::FragmentEnd), urlLengthUntilPart(base, URLPart::QueryEnd));
- if (!base.m_string.is8Bit()) {
- const String& fragment = base.m_string;
- bool seenUnicode = false;
- for (size_t i = base.m_queryEnd; i < base.m_fragmentEnd; ++i) {
- if (!seenUnicode && !isASCII(fragment[i]))
- seenUnicode = true;
- if (seenUnicode)
- m_unicodeFragmentBuffer.uncheckedAppend(fragment[i]);
- else
- m_asciiBuffer.uncheckedAppend(fragment[i]);
- }
- }
- } else {
- size_t length = urlLengthUntilPart(base, part);
- copyASCIIStringUntil(base.m_string, length, length);
- }
</del><ins>+ copyASCIIStringUntil(base.m_string, urlLengthUntilPart(base, part));
</ins><span class="cx"> switch (part) {
</span><span class="cx"> case URLPart::FragmentEnd:
</span><del>- m_url.m_fragmentEnd = base.m_fragmentEnd;
- FALLTHROUGH;
</del><ins>+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> case URLPart::QueryEnd:
</span><span class="cx"> m_url.m_queryEnd = base.m_queryEnd;
</span><span class="cx"> FALLTHROUGH;
</span><span class="lines">@@ -1082,8 +1060,10 @@
</span><span class="cx"> : m_inputString(input)
</span><span class="cx"> {
</span><span class="cx"> if (input.isNull()) {
</span><del>- if (base.isValid() && !base.m_cannotBeABaseURL)
</del><ins>+ if (base.isValid() && !base.m_cannotBeABaseURL) {
</ins><span class="cx"> m_url = base;
</span><ins>+ m_url.removeFragmentIdentifier();
+ }
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1097,7 +1077,8 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_url.m_isValid
</span><span class="cx"> || m_didSeeSyntaxViolation == (m_url.string() != input)
</span><del>- || (input.isEmpty() && m_url.m_string == base.m_string));
</del><ins>+ || (input.isAllSpecialCharacters<isC0ControlOrSpace>()
+ && m_url.m_string == base.m_string.left(base.m_queryEnd)));
</ins><span class="cx"> ASSERT(internalValuesConsistent(m_url));
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> if (!m_didSeeSyntaxViolation) {
</span><span class="lines">@@ -1755,6 +1736,7 @@
</span><span class="cx"> LOG_FINAL_STATE("SchemeStart");
</span><span class="cx"> if (!currentPosition(c) && base.isValid() && !base.m_cannotBeABaseURL) {
</span><span class="cx"> m_url = base;
</span><ins>+ m_url.removeFragmentIdentifier();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> failure();
</span><span class="lines">@@ -1788,8 +1770,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::Relative:
</span><span class="cx"> LOG_FINAL_STATE("Relative");
</span><del>- copyURLPartsUntil(base, URLPart::FragmentEnd, c);
- break;
</del><ins>+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> case State::RelativeSlash:
</span><span class="cx"> LOG_FINAL_STATE("RelativeSlash");
</span><span class="cx"> copyURLPartsUntil(base, URLPart::PortEnd, c);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (206734 => 206735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2016-10-03 16:43:03 UTC (rev 206734)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-10-03 17:28:04 UTC (rev 206735)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> void appendToASCIIBuffer(const char*, size_t);
</span><span class="cx"> void appendToASCIIBuffer(const LChar* characters, size_t size) { appendToASCIIBuffer(reinterpret_cast<const char*>(characters), size); }
</span><span class="cx"> template<typename CharacterType> void encodeQuery(const Vector<UChar>& source, const TextEncoding&, CodePointIterator<CharacterType>);
</span><del>- void copyASCIIStringUntil(const String&, size_t lengthIf8Bit, size_t lengthIf16Bit);
</del><ins>+ void copyASCIIStringUntil(const String&, size_t length);
</ins><span class="cx"> StringView parsedDataView(size_t start, size_t length);
</span><span class="cx">
</span><span class="cx"> using IPv4Address = uint32_t;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206734 => 206735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-03 16:43:03 UTC (rev 206734)
+++ trunk/Tools/ChangeLog 2016-10-03 17:28:04 UTC (rev 206735)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-03 Alex Christensen <achristensen@webkit.org>
+
+ URLParser: empty relative URLs should not copy fragment from the base URL
+ https://bugs.webkit.org/show_bug.cgi?id=162864
+
+ Reviewed by Chris Dumez.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-10-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Cleanup persistent credential storage code
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206734 => 206735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-03 16:43:03 UTC (rev 206734)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-10-03 17:28:04 UTC (rev 206735)
</span><span class="lines">@@ -404,6 +404,11 @@
</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><span class="cx"> checkRelativeURL("http://f:0/c", "http://example.org/foo/bar", {"http", "", "", "f", 0, "/c", "", "", "http://f:0/c"});
</span><ins>+ checkRelativeURL(String(), "http://host/#fragment", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
+ checkRelativeURL("", "http://host/#fragment", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
+ checkRelativeURL(" ", "http://host/#fragment", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
+ checkRelativeURL(" ", "http://host/path?query#fra#gment", {"http", "", "", "host", 0, "/path", "query", "", "http://host/path?query"});
+ checkRelativeURL(" \a ", "http://host/#fragment", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
</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></pre>
</div>
</div>
</body>
</html>