<!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>[207273] 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/207273">207273</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 19:38:13 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix out-of-bounds reading in URLParser when parsing improperly percent-encoded values
https://bugs.webkit.org/show_bug.cgi?id=163376
Reviewed by Saam Barati.
Source/WebCore:
Covered by new API tests, which used to crash under asan.
* platform/URLParser.cpp:
(WebCore::percentDecode):
If you subtract 2 from size_t's smaller than 2, you're gonna have a bad time.
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="#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 (207272 => 207273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-10-13 02:28:49 UTC (rev 207272)
+++ trunk/Source/WebCore/ChangeLog        2016-10-13 02:38:13 UTC (rev 207273)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-10-12 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Fix out-of-bounds reading in URLParser when parsing improperly percent-encoded values
+ https://bugs.webkit.org/show_bug.cgi?id=163376
+
+ Reviewed by Saam Barati.
+
+ Covered by new API tests, which used to crash under asan.
+
+ * platform/URLParser.cpp:
+ (WebCore::percentDecode):
+ If you subtract 2 from size_t's smaller than 2, you're gonna have a bad time.
+
+2016-10-12 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Mail needs nonspecial URLs to keep case in host and not have slash after host
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163373
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (207272 => 207273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp        2016-10-13 02:28:49 UTC (rev 207272)
+++ trunk/Source/WebCore/platform/URLParser.cpp        2016-10-13 02:38:13 UTC (rev 207273)
</span><span class="lines">@@ -2445,7 +2445,7 @@
</span><span class="cx"> uint8_t byte = input[i];
</span><span class="cx"> if (byte != '%')
</span><span class="cx"> output.uncheckedAppend(byte);
</span><del>- else if (i < length - 2) {
</del><ins>+ else if (length > 2 && i < length - 2) {
</ins><span class="cx"> if (isASCIIHexDigit(input[i + 1]) && isASCIIHexDigit(input[i + 2])) {
</span><span class="cx"> output.uncheckedAppend(toASCIIHexValue(input[i + 1], input[i + 2]));
</span><span class="cx"> i += 2;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207272 => 207273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-10-13 02:28:49 UTC (rev 207272)
+++ trunk/Tools/ChangeLog        2016-10-13 02:38:13 UTC (rev 207273)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-12 Alex Christensen <achristensen@webkit.org>
+
+ Fix out-of-bounds reading in URLParser when parsing improperly percent-encoded values
+ https://bugs.webkit.org/show_bug.cgi?id=163376
+
+ Reviewed by Saam Barati.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-10-11 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Add preliminary support for extended colors to WebCore::Color
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (207272 => 207273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp        2016-10-13 02:28:49 UTC (rev 207272)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp        2016-10-13 02:38:13 UTC (rev 207273)
</span><span class="lines">@@ -706,11 +706,31 @@
</span><span class="cx"> {"file", "", "", "", 0, "/pAtH/", "", "", "file:///pAtH/"},
</span><span class="cx"> {"file", "", "", "", 0, "pAtH/", "", "", "file://pAtH/"});
</span><span class="cx">
</span><del>- // FIXME: Fix and test incomplete percent encoded characters in the middle and end of the input string.
- // FIXME: Fix and test percent encoded upper case characters in the host.
</del><span class="cx"> checkURLDifferences("http://host%73",
</span><span class="cx"> {"http", "", "", "hosts", 0, "/", "", "", "http://hosts/"},
</span><span class="cx"> {"http", "", "", "host%73", 0, "/", "", "", "http://host%73/"});
</span><ins>+ checkURLDifferences("http://host%53",
+ {"http", "", "", "hosts", 0, "/", "", "", "http://hosts/"},
+ {"http", "", "", "host%53", 0, "/", "", "", "http://host%53/"});
+ checkURLDifferences("http://%",
+ {"", "", "", "", 0, "", "", "", "http://%"},
+ {"http", "", "", "%", 0, "/", "", "", "http://%/"});
+ checkURLDifferences("http://%7",
+ {"", "", "", "", 0, "", "", "", "http://%7"},
+ {"http", "", "", "%7", 0, "/", "", "", "http://%7/"});
+ checkURLDifferences("http://%7s",
+ {"", "", "", "", 0, "", "", "", "http://%7s"},
+ {"http", "", "", "%7s", 0, "/", "", "", "http://%7s/"});
+ checkURLDifferences("http://%73",
+ {"http", "", "", "s", 0, "/", "", "", "http://s/"},
+ {"http", "", "", "%73", 0, "/", "", "", "http://%73/"});
+ checkURLDifferences("http://abcdefg%",
+ {"", "", "", "", 0, "", "", "", "http://abcdefg%"},
+ {"http", "", "", "abcdefg%", 0, "/", "", "", "http://abcdefg%/"});
+ checkURLDifferences("http://abcd%7Xefg",
+ {"", "", "", "", 0, "", "", "", "http://abcd%7Xefg"},
+ {"http", "", "", "abcd%7xefg", 0, "/", "", "", "http://abcd%7xefg/"});
+
</ins><span class="cx">
</span><span class="cx"> // URLParser matches Chrome and the spec, but not URL::parse or Firefox.
</span><span class="cx"> checkURLDifferences(utf16String(u"http://0Xc0.0250.01"),
</span><span class="lines">@@ -1101,6 +1121,8 @@
</span><span class="cx"> shouldFail("i");
</span><span class="cx"> shouldFail("asdf");
</span><span class="cx"> shouldFail("~");
</span><ins>+ shouldFail("%");
+ shouldFail("//%");
</ins><span class="cx"> shouldFail("~", "about:blank");
</span><span class="cx"> shouldFail("~~~");
</span><span class="cx"> shouldFail("://:0/");
</span></span></pre>
</div>
</div>
</body>
</html>