<!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>[183811] trunk/Source/WebKit2</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/183811">183811</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-05-05 09:27:39 -0700 (Tue, 05 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crashes in SandboxExtension::consumePermanently when uploading
https://bugs.webkit.org/show_bug.cgi?id=144611
rdar://problem/10156710
Reviewed by Darin Adler.
This only fixes the crashes, uploading still won't work.
Added null checks and some logging that may help us get to the root cause eventually.
* Shared/SandboxExtension.h:
(WebKit::SandboxExtension::createHandle):
(WebKit::SandboxExtension::createHandleForReadWriteDirectory):
* Shared/mac/SandboxExtensionMac.mm:
(WebKit::SandboxExtension::createHandle):
(WebKit::SandboxExtension::createHandleForReadWriteDirectory):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didChooseFilesForOpenPanel):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::extendSandboxForFileFromOpenPanel):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedSandboxExtensionh">trunk/Source/WebKit2/Shared/SandboxExtension.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSandboxExtensionMacmm">trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183810 => 183811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-05 16:22:23 UTC (rev 183810)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-05 16:27:39 UTC (rev 183811)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-05-05 Alexey Proskuryakov <ap@apple.com>
+
+ Crashes in SandboxExtension::consumePermanently when uploading
+ https://bugs.webkit.org/show_bug.cgi?id=144611
+ rdar://problem/10156710
+
+ Reviewed by Darin Adler.
+
+ This only fixes the crashes, uploading still won't work.
+ Added null checks and some logging that may help us get to the root cause eventually.
+
+ * Shared/SandboxExtension.h:
+ (WebKit::SandboxExtension::createHandle):
+ (WebKit::SandboxExtension::createHandleForReadWriteDirectory):
+ * Shared/mac/SandboxExtensionMac.mm:
+ (WebKit::SandboxExtension::createHandle):
+ (WebKit::SandboxExtension::createHandleForReadWriteDirectory):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChooseFilesForOpenPanel):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::extendSandboxForFileFromOpenPanel):
+
</ins><span class="cx"> 2015-05-05 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove TextureMapperImageBuffer
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSandboxExtensionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SandboxExtension.h (183810 => 183811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SandboxExtension.h 2015-05-05 16:22:23 UTC (rev 183810)
+++ trunk/Source/WebKit2/Shared/SandboxExtension.h 2015-05-05 16:27:39 UTC (rev 183811)
</span><span class="lines">@@ -90,8 +90,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<SandboxExtension> create(const Handle&);
</span><del>- static void createHandle(const String& path, Type type, Handle&);
- static void createHandleForReadWriteDirectory(const String& path, Handle&); // Will attempt to create the directory.
</del><ins>+ static bool createHandle(const String& path, Type type, Handle&);
+ static bool createHandleForReadWriteDirectory(const String& path, Handle&); // Will attempt to create the directory.
</ins><span class="cx"> static String createHandleForTemporaryFile(const String& prefix, Type type, Handle&);
</span><span class="cx"> ~SandboxExtension();
</span><span class="cx">
</span><span class="lines">@@ -124,8 +124,8 @@
</span><span class="cx"> inline void SandboxExtension::HandleArray::encode(IPC::ArgumentEncoder&) const { }
</span><span class="cx"> inline bool SandboxExtension::HandleArray::decode(IPC::ArgumentDecoder&, HandleArray&) { return true; }
</span><span class="cx"> inline PassRefPtr<SandboxExtension> SandboxExtension::create(const Handle&) { return 0; }
</span><del>-inline void SandboxExtension::createHandle(const String&, Type, Handle&) { }
-inline void SandboxExtension::createHandleForReadWriteDirectory(const String&, Handle&) { }
</del><ins>+inline bool SandboxExtension::createHandle(const String&, Type, Handle&) { return true; }
+inline bool SandboxExtension::createHandleForReadWriteDirectory(const String&, Handle&) { return true; }
</ins><span class="cx"> inline String SandboxExtension::createHandleForTemporaryFile(const String& /*prefix*/, Type, Handle&) {return String();}
</span><span class="cx"> inline SandboxExtension::~SandboxExtension() { }
</span><span class="cx"> inline bool SandboxExtension::revoke() { return true; }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSandboxExtensionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm (183810 => 183811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2015-05-05 16:22:23 UTC (rev 183810)
+++ trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2015-05-05 16:27:39 UTC (rev 183811)
</span><span class="lines">@@ -212,28 +212,31 @@
</span><span class="cx"> return String::fromUTF8(resolveSymlinksInPath(path.utf8()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SandboxExtension::createHandle(const String& path, Type type, Handle& handle)
</del><ins>+bool SandboxExtension::createHandle(const String& path, Type type, Handle& handle)
</ins><span class="cx"> {
</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><span class="cx"> CString standardizedPath = resolveSymlinksInPath(fileSystemRepresentation([(NSString *)path stringByStandardizingPath]));
</span><span class="cx"> handle.m_sandboxExtension = WKSandboxExtensionCreate(standardizedPath.data(), wkSandboxExtensionType(type));
</span><del>- if (!handle.m_sandboxExtension)
</del><ins>+ if (!handle.m_sandboxExtension) {
</ins><span class="cx"> LOG_ERROR("Could not create a sandbox extension for '%s'", path.utf8().data());
</span><ins>+ return false;
+ }
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void SandboxExtension::createHandleForReadWriteDirectory(const String& path, SandboxExtension::Handle& handle)
</del><ins>+bool SandboxExtension::createHandleForReadWriteDirectory(const String& path, SandboxExtension::Handle& handle)
</ins><span class="cx"> {
</span><span class="cx"> NSError *error = nil;
</span><span class="cx"> NSString *nsPath = path;
</span><span class="cx">
</span><span class="cx"> if (![[NSFileManager defaultManager] createDirectoryAtPath:nsPath withIntermediateDirectories:YES attributes:nil error:&error]) {
</span><span class="cx"> NSLog(@"could not create \"%@\", error %@", nsPath, error);
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- SandboxExtension::createHandle(path, SandboxExtension::ReadWrite, handle);
</del><ins>+ return SandboxExtension::createHandle(path, SandboxExtension::ReadWrite, handle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String SandboxExtension::createHandleForTemporaryFile(const String& prefix, Type type, Handle& handle)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (183810 => 183811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-05 16:22:23 UTC (rev 183810)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-05 16:27:39 UTC (rev 183811)
</span><span class="lines">@@ -4230,7 +4230,13 @@
</span><span class="cx"> // is gated on a way of passing SandboxExtension::Handles in a Vector.
</span><span class="cx"> for (size_t i = 0; i < fileURLs.size(); ++i) {
</span><span class="cx"> SandboxExtension::Handle sandboxExtensionHandle;
</span><del>- SandboxExtension::createHandle(fileURLs[i], SandboxExtension::ReadOnly, sandboxExtensionHandle);
</del><ins>+ bool createdExtension = SandboxExtension::createHandle(fileURLs[i], SandboxExtension::ReadOnly, sandboxExtensionHandle);
+ if (!createdExtension) {
+ // This can legitimately fail if a directory containing the file is deleted after the file was chosen.
+ // We also have reports of cases where this likely fails for some unknown reason, <rdar://problem/10156710>.
+ WTFLogAlways("WebPageProxy::didChooseFilesForOpenPanel: could not create a sandbox extension for '%s'\n", fileURLs[i].utf8().data());
+ continue;
+ }
</ins><span class="cx"> m_process->send(Messages::WebPage::ExtendSandboxForFileFromOpenPanel(sandboxExtensionHandle), m_pageID);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (183810 => 183811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-05 16:22:23 UTC (rev 183810)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-05 16:27:39 UTC (rev 183811)
</span><span class="lines">@@ -3293,7 +3293,11 @@
</span><span class="cx"> #if ENABLE(SANDBOX_EXTENSIONS)
</span><span class="cx"> void WebPage::extendSandboxForFileFromOpenPanel(const SandboxExtension::Handle& handle)
</span><span class="cx"> {
</span><del>- SandboxExtension::create(handle)->consumePermanently();
</del><ins>+ bool result = SandboxExtension::consumePermanently(handle);
+ if (!result) {
+ // We have reports of cases where this fails for some unknown reason, <rdar://problem/10156710>.
+ WTFLogAlways("WebPage::extendSandboxForFileFromOpenPanel(): Could not consume a sandbox extension");
+ }
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>