<!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>[199778] 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/199778">199778</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-04-20 11:26:20 -0700 (Wed, 20 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][Mac][iOS] WebContent crash when using special file:// URI scheme @ WebKit::resolveSymlinksInPath(WTF::CString const&) + 159
https://bugs.webkit.org/show_bug.cgi?id=156747
<rdar://problem/24648176>
Reviewed by Alexey Proskuryakov.
Source/WebKit2:
FileSystemCF::fileSystemRepresentation return a null string when presented with a file URL that contains embedded nulls. When
this happens, SandboxExtension::createHandle attempts to pass a null string to 'resolveSymlinksInPath', which attemps to call
'strrchr' on the null pointer, causing a crash.
Test: fast/url/file-uri-with-embedded-null-no-crash.html
* Shared/mac/SandboxExtensionMac.mm:
(WebKit::SandboxExtension::createHandle): If 'fileSystemRepresentation' is null, return early with an error.
LayoutTests:
* fast/url/file-uri-with-embedded-null-no-crash-expected.txt: Added.
* fast/url/file-uri-with-embedded-null-no-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSandboxExtensionMacmm">trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasturlfileuriwithembeddednullnocrashexpectedtxt">trunk/LayoutTests/fast/url/file-uri-with-embedded-null-no-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasturlfileuriwithembeddednullnocrashhtml">trunk/LayoutTests/fast/url/file-uri-with-embedded-null-no-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199777 => 199778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-20 18:01:40 UTC (rev 199777)
+++ trunk/LayoutTests/ChangeLog 2016-04-20 18:26:20 UTC (rev 199778)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-20 Brent Fulgham <bfulgham@apple.com>
+
+ [WK2][Mac][iOS] WebContent crash when using special file:// URI scheme @ WebKit::resolveSymlinksInPath(WTF::CString const&) + 159
+ https://bugs.webkit.org/show_bug.cgi?id=156747
+ <rdar://problem/24648176>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * fast/url/file-uri-with-embedded-null-no-crash-expected.txt: Added.
+ * fast/url/file-uri-with-embedded-null-no-crash.html: Added.
+
</ins><span class="cx"> 2016-04-20 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Hangable punctuation measurement using the wrong indices.
</span></span></pre></div>
<a id="trunkLayoutTestsfasturlfileuriwithembeddednullnocrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/url/file-uri-with-embedded-null-no-crash-expected.txt (0 => 199778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/url/file-uri-with-embedded-null-no-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/url/file-uri-with-embedded-null-no-crash-expected.txt 2016-04-20 18:26:20 UTC (rev 199778)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Tests that attempting to ping an invalid file URI doesn't crash WebKit.
+
+Click Me
+The test passes if it does not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfasturlfileuriwithembeddednullnocrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/url/file-uri-with-embedded-null-no-crash.html (0 => 199778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/url/file-uri-with-embedded-null-no-crash.html (rev 0)
+++ trunk/LayoutTests/fast/url/file-uri-with-embedded-null-no-crash.html 2016-04-20 18:26:20 UTC (rev 199778)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<p>Tests that attempting to ping an invalid file URI doesn't crash WebKit.</p>
+<a href="#" ping="file://%00/%00/x">Click Me</a><script>document.querySelector('a').click();</script>
+<p>The test passes if it does not crash.</p>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199777 => 199778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-20 18:01:40 UTC (rev 199777)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-20 18:26:20 UTC (rev 199778)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-20 Brent Fulgham <bfulgham@apple.com>
+
+ [WK2][Mac][iOS] WebContent crash when using special file:// URI scheme @ WebKit::resolveSymlinksInPath(WTF::CString const&) + 159
+ https://bugs.webkit.org/show_bug.cgi?id=156747
+ <rdar://problem/24648176>
+
+ Reviewed by Alexey Proskuryakov.
+
+ FileSystemCF::fileSystemRepresentation return a null string when presented with a file URL that contains embedded nulls. When
+ this happens, SandboxExtension::createHandle attempts to pass a null string to 'resolveSymlinksInPath', which attemps to call
+ 'strrchr' on the null pointer, causing a crash.
+
+ Test: fast/url/file-uri-with-embedded-null-no-crash.html
+
+ * Shared/mac/SandboxExtensionMac.mm:
+ (WebKit::SandboxExtension::createHandle): If 'fileSystemRepresentation' is null, return early with an error.
+
</ins><span class="cx"> 2016-04-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix CMake build.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSandboxExtensionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm (199777 => 199778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2016-04-20 18:01:40 UTC (rev 199777)
+++ trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2016-04-20 18:26:20 UTC (rev 199778)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -217,7 +217,13 @@
</span><span class="cx"> ASSERT(!handle.m_sandboxExtension);
</span><span class="cx">
</span><span class="cx"> // FIXME: Do we need both resolveSymlinksInPath() and -stringByStandardizingPath?
</span><del>- CString standardizedPath = resolveSymlinksInPath(fileSystemRepresentation([(NSString *)path stringByStandardizingPath]));
</del><ins>+ CString fileSystemPath = fileSystemRepresentation([(NSString *)path stringByStandardizingPath]);
+ if (fileSystemPath.isNull()) {
+ LOG_ERROR("Could not create a valid file system representation for the string '%s' of length %lu", fileSystemPath.data(), fileSystemPath.length());
+ return false;
+ }
+
+ CString standardizedPath = resolveSymlinksInPath(fileSystemPath);
</ins><span class="cx"> handle.m_sandboxExtension = WKSandboxExtensionCreate(standardizedPath.data(), wkSandboxExtensionType(type));
</span><span class="cx"> if (!handle.m_sandboxExtension) {
</span><span class="cx"> LOG_ERROR("Could not create a sandbox extension for '%s'", path.utf8().data());
</span></span></pre>
</div>
</div>
</body>
</html>