<!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>[207297] 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/207297">207297</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-10-13 11:57:27 -0700 (Thu, 13 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disable URLParser for non-Safari iOS and Mac apps for now
https://bugs.webkit.org/show_bug.cgi?id=163397
Reviewed by Tim Horton.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/207268">r207268</a> was an awful hack, and it was insufficient.
Disable the URLParser for other apps for now. Hopefully we can enable it everywhere soon.
No change in behavior for testing infrastructure.
Old URLs were well tested before making the switch, and nothing has changed for them.
* platform/URLParser.cpp:
(WebCore::URLParser::parse):
(WebCore::URLParser::parseHostAndPort):
(WebCore::URLParser::setEnabled):
(WebCore::URLParser::enabled):
* platform/URLParser.h:
Tools:
* DumpRenderTree/mac/DumpRenderTree.mm:
(DumpRenderTreeMain):
* WebKitTestRunner/ios/mainIOS.mm:
(main):
* WebKitTestRunner/mac/main.mm:
(main):</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="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosmainIOSmm">trunk/Tools/WebKitTestRunner/ios/mainIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacmainmm">trunk/Tools/WebKitTestRunner/mac/main.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207296 => 207297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-13 18:53:45 UTC (rev 207296)
+++ trunk/Source/WebCore/ChangeLog 2016-10-13 18:57:27 UTC (rev 207297)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-10-13 Alex Christensen <achristensen@webkit.org>
+
+ Disable URLParser for non-Safari iOS and Mac apps for now
+ https://bugs.webkit.org/show_bug.cgi?id=163397
+
+ Reviewed by Tim Horton.
+
+ r207268 was an awful hack, and it was insufficient.
+ Disable the URLParser for other apps for now. Hopefully we can enable it everywhere soon.
+
+ No change in behavior for testing infrastructure.
+ Old URLs were well tested before making the switch, and nothing has changed for them.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parse):
+ (WebCore::URLParser::parseHostAndPort):
+ (WebCore::URLParser::setEnabled):
+ (WebCore::URLParser::enabled):
+ * platform/URLParser.h:
+
</ins><span class="cx"> 2016-10-13 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] TimeControl and TimeLabel
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (207296 => 207297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-10-13 18:53:45 UTC (rev 207296)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-10-13 18:57:27 UTC (rev 207297)
</span><span class="lines">@@ -1128,12 +1128,6 @@
</span><span class="cx"> template<typename CharacterType>
</span><span class="cx"> void URLParser::parse(const CharacterType* input, const unsigned length, const URL& base, const TextEncoding& encoding)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
- static bool isMail = MacApplication::isAppleMail();
-#else
- static bool isMail = false;
-#endif
-
</del><span class="cx"> URL_PARSER_LOG("Parsing URL <%s> base <%s> encoding <%s>", String(input, length).utf8().data(), base.string().utf8().data(), encoding.name());
</span><span class="cx"> m_url = { };
</span><span class="cx"> ASSERT(m_asciiBuffer.isEmpty());
</span><span class="lines">@@ -1460,7 +1454,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> m_url.m_userEnd = currentPosition(authorityOrHostBegin);
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userEnd;
</span><del>- if (!parseHostAndPort(iterator, isMail)) {
</del><ins>+ if (!parseHostAndPort(iterator)) {
</ins><span class="cx"> failure();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1482,7 +1476,7 @@
</span><span class="cx"> do {
</span><span class="cx"> LOG_STATE("Host");
</span><span class="cx"> if (*c == '/' || *c == '?' || *c == '#') {
</span><del>- if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c), isMail)) {
</del><ins>+ if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
</ins><span class="cx"> failure();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1653,7 +1647,7 @@
</span><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c), isMail)) {
</del><ins>+ if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
</ins><span class="cx"> failure();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1873,16 +1867,13 @@
</span><span class="cx"> m_url.m_hostEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_portEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_pathEnd = m_url.m_userStart + 2;
</span><del>- } else if (!parseHostAndPort(authorityOrHostBegin, isMail)) {
</del><ins>+ } else if (!parseHostAndPort(authorityOrHostBegin)) {
</ins><span class="cx"> failure();
</span><span class="cx"> return;
</span><span class="cx"> } else {
</span><del>- if (LIKELY(!isMail || m_urlIsSpecial)) {
- syntaxViolation(c);
- appendToASCIIBuffer('/');
- m_url.m_pathEnd = m_url.m_portEnd + 1;
- } else
- m_url.m_pathEnd = m_url.m_portEnd;
</del><ins>+ syntaxViolation(c);
+ appendToASCIIBuffer('/');
+ m_url.m_pathEnd = m_url.m_portEnd + 1;
</ins><span class="cx"> }
</span><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_pathEnd;
</span><span class="cx"> m_url.m_queryEnd = m_url.m_pathEnd;
</span><span class="lines">@@ -1890,16 +1881,13 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::Host:
</span><span class="cx"> LOG_FINAL_STATE("Host");
</span><del>- if (!parseHostAndPort(authorityOrHostBegin, isMail)) {
</del><ins>+ if (!parseHostAndPort(authorityOrHostBegin)) {
</ins><span class="cx"> failure();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (LIKELY(!isMail || m_urlIsSpecial)) {
- syntaxViolation(c);
- appendToASCIIBuffer('/');
- m_url.m_pathEnd = m_url.m_portEnd + 1;
- } else
- m_url.m_pathEnd = m_url.m_portEnd;
</del><ins>+ syntaxViolation(c);
+ appendToASCIIBuffer('/');
+ m_url.m_pathEnd = m_url.m_portEnd + 1;
</ins><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_pathEnd;
</span><span class="cx"> m_url.m_queryEnd = m_url.m_pathEnd;
</span><span class="cx"> m_url.m_fragmentEnd = m_url.m_pathEnd;
</span><span class="lines">@@ -1953,7 +1941,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c), isMail)) {
</del><ins>+ if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
</ins><span class="cx"> failure();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2568,7 +2556,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-bool URLParser::parseHostAndPort(CodePointIterator<CharacterType> iterator, const bool& isMail)
</del><ins>+bool URLParser::parseHostAndPort(CodePointIterator<CharacterType> iterator)
</ins><span class="cx"> {
</span><span class="cx"> if (iterator.atEnd())
</span><span class="cx"> return false;
</span><span class="lines">@@ -2618,13 +2606,9 @@
</span><span class="cx"> }
</span><span class="cx"> for (; hostIterator != iterator; ++hostIterator) {
</span><span class="cx"> if (LIKELY(!isTabOrNewline(*hostIterator))) {
</span><del>- if (UNLIKELY(isMail && !m_urlIsSpecial))
- appendToASCIIBuffer(*hostIterator);
- else {
- if (UNLIKELY(isASCIIUpper(*hostIterator)))
- syntaxViolation(hostIterator);
- appendToASCIIBuffer(toASCIILower(*hostIterator));
- }
</del><ins>+ if (UNLIKELY(isASCIIUpper(*hostIterator)))
+ syntaxViolation(hostIterator);
+ appendToASCIIBuffer(toASCIILower(*hostIterator));
</ins><span class="cx"> } else
</span><span class="cx"> syntaxViolation(hostIterator);
</span><span class="cx"> }
</span><span class="lines">@@ -2803,16 +2787,31 @@
</span><span class="cx"> // It should be able to be deduced from m_isValid and m_string.length() to save memory.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool urlParserEnabled = true;
</del><ins>+enum class URLParserEnabled {
+ Undetermined,
+ Yes,
+ No
+};
</ins><span class="cx">
</span><ins>+static URLParserEnabled urlParserEnabled = URLParserEnabled::Undetermined;
+
</ins><span class="cx"> void URLParser::setEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- urlParserEnabled = enabled;
</del><ins>+ urlParserEnabled = enabled ? URLParserEnabled::Yes : URLParserEnabled::No;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool URLParser::enabled()
</span><span class="cx"> {
</span><del>- return urlParserEnabled;
</del><ins>+ if (urlParserEnabled == URLParserEnabled::Undetermined) {
+#if PLATFORM(MAC)
+ urlParserEnabled = MacApplication::isSafari() ? URLParserEnabled::Yes : URLParserEnabled::No;
+#elif PLATFORM(IOS)
+ urlParserEnabled = IOSApplication::isMobileSafari() ? URLParserEnabled::Yes : URLParserEnabled::No;
+#else
+ urlParserEnabled = URLParserEnabled::Yes;
+#endif
+ }
+ return urlParserEnabled == URLParserEnabled::Yes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (207296 => 207297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2016-10-13 18:53:45 UTC (rev 207296)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-10-13 18:57:27 UTC (rev 207297)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType> void parse(const CharacterType*, const unsigned length, const URL&, const TextEncoding&);
</span><span class="cx"> template<typename CharacterType> void parseAuthority(CodePointIterator<CharacterType>);
</span><del>- template<typename CharacterType> bool parseHostAndPort(CodePointIterator<CharacterType>, const bool& isMail);
</del><ins>+ template<typename CharacterType> bool parseHostAndPort(CodePointIterator<CharacterType>);
</ins><span class="cx"> template<typename CharacterType> bool parsePort(CodePointIterator<CharacterType>&);
</span><span class="cx">
</span><span class="cx"> void failure();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207296 => 207297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-13 18:53:45 UTC (rev 207296)
+++ trunk/Tools/ChangeLog 2016-10-13 18:57:27 UTC (rev 207297)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-13 Alex Christensen <achristensen@webkit.org>
+
+ Disable URLParser for non-Safari iOS and Mac apps for now
+ https://bugs.webkit.org/show_bug.cgi?id=163397
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (DumpRenderTreeMain):
+ * WebKitTestRunner/ios/mainIOS.mm:
+ (main):
+ * WebKitTestRunner/mac/main.mm:
+ (main):
+
</ins><span class="cx"> 2016-10-12 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix out-of-bounds reading in URLParser when parsing improperly percent-encoded values
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (207296 => 207297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-10-13 18:53:45 UTC (rev 207296)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-10-13 18:57:27 UTC (rev 207297)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #import <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #import <JavaScriptCore/TestRunnerUtils.h>
</span><span class="cx"> #import <WebCore/LogInitialization.h>
</span><ins>+#import <WebCore/URLParser.h>
</ins><span class="cx"> #import <WebKit/DOMElement.h>
</span><span class="cx"> #import <WebKit/DOMExtensions.h>
</span><span class="cx"> #import <WebKit/DOMRange.h>
</span><span class="lines">@@ -1409,6 +1410,7 @@
</span><span class="cx">
</span><span class="cx"> int DumpRenderTreeMain(int argc, const char *argv[])
</span><span class="cx"> {
</span><ins>+ WebCore::URLParser::setEnabled(true);
</ins><span class="cx"> atexit(atexitFunction);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosmainIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/mainIOS.mm (207296 => 207297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/mainIOS.mm 2016-10-13 18:53:45 UTC (rev 207296)
+++ trunk/Tools/WebKitTestRunner/ios/mainIOS.mm 2016-10-13 18:57:27 UTC (rev 207297)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import "TestController.h"
</span><span class="cx"> #import "UIKitSPI.h"
</span><span class="cx"> #import <UIKit/UIKit.h>
</span><ins>+#import <WebCore/URLParser.h>
</ins><span class="cx">
</span><span class="cx"> static int _argc;
</span><span class="cx"> static const char **_argv;
</span><span class="lines">@@ -64,6 +65,7 @@
</span><span class="cx">
</span><span class="cx"> int main(int argc, const char* argv[])
</span><span class="cx"> {
</span><ins>+ WebCore::URLParser::setEnabled(true);
</ins><span class="cx"> _argc = argc;
</span><span class="cx"> _argv = argv;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacmainmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/main.mm (207296 => 207297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/main.mm 2016-10-13 18:53:45 UTC (rev 207296)
+++ trunk/Tools/WebKitTestRunner/mac/main.mm 2016-10-13 18:57:27 UTC (rev 207297)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import "PlatformWebView.h"
</span><span class="cx"> #import "TestController.h"
</span><ins>+#import <WebCore/URLParser.h>
</ins><span class="cx">
</span><span class="cx"> static void setDefaultsToConsistentValuesForTesting()
</span><span class="cx"> {
</span><span class="lines">@@ -55,6 +56,7 @@
</span><span class="cx">
</span><span class="cx"> int main(int argc, const char* argv[])
</span><span class="cx"> {
</span><ins>+ WebCore::URLParser::setEnabled(true);
</ins><span class="cx"> NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span class="cx"> [NSApplication sharedApplication];
</span><span class="cx"> setDefaultsToConsistentValuesForTesting();
</span></span></pre>
</div>
</div>
</body>
</html>