<!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>[195900] trunk/Source/WebCore</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/195900">195900</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-01-30 11:22:58 -0800 (Sat, 30 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] WebKit1 apps crash in ___ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse_block_invoke1
<http://webkit.org/b/153710>
<rdar://problem/23116706>
Reviewed by Darin Adler.
* loader/cocoa/DiskCacheMonitorCocoa.mm:
(WebCore::DiskCacheMonitor::DiskCacheMonitor):
- Fix race condition on iOS WebKit1 clients by calling the block
to cancel the DiskCacheMonitor on the WebThread, which is the
same thread where the CFCachedURLResponseCallBackBlock is
called.
- Removed whitespace to adhere to style.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm">trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195899 => 195900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-30 18:38:20 UTC (rev 195899)
+++ trunk/Source/WebCore/ChangeLog        2016-01-30 19:22:58 UTC (rev 195900)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-30 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] WebKit1 apps crash in ___ZN7WebCore16DiskCacheMonitorC2ERKNS_15ResourceRequestENS_9SessionIDEPK20_CFCachedURLResponse_block_invoke1
+ <http://webkit.org/b/153710>
+ <rdar://problem/23116706>
+
+ Reviewed by Darin Adler.
+
+ * loader/cocoa/DiskCacheMonitorCocoa.mm:
+ (WebCore::DiskCacheMonitor::DiskCacheMonitor):
+ - Fix race condition on iOS WebKit1 clients by calling the block
+ to cancel the DiskCacheMonitor on the WebThread, which is the
+ same thread where the CFCachedURLResponseCallBackBlock is
+ called.
+ - Removed whitespace to adhere to style.
+
</ins><span class="cx"> 2016-01-30 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> TouchList should be retargeted
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm (195899 => 195900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm        2016-01-30 18:38:20 UTC (rev 195899)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm        2016-01-30 19:22:58 UTC (rev 195900)
</span><span class="lines">@@ -71,12 +71,21 @@
</span><span class="cx">
</span><span class="cx"> // Set up a delayed callback to cancel this monitor if the resource hasn't been cached yet.
</span><span class="cx"> __block DiskCacheMonitor* rawMonitor = this;
</span><del>-
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC * diskCacheMonitorTimeout), dispatch_get_main_queue(), ^{
</del><ins>+ auto cancelMonitorBlock = ^{
</ins><span class="cx"> delete rawMonitor; // Balanced by "new DiskCacheMonitor" in monitorFileBackingStoreCreation.
</span><span class="cx"> rawMonitor = nullptr;
</span><del>- });
</del><ins>+ };
</ins><span class="cx">
</span><ins>+#if USE(WEB_THREAD)
+ auto cancelMonitorBlockToRun = ^{
+ WebThreadRun(cancelMonitorBlock);
+ };
+#else
+ auto cancelMonitorBlockToRun = cancelMonitorBlock;
+#endif
+
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC * diskCacheMonitorTimeout), dispatch_get_main_queue(), cancelMonitorBlockToRun);
+
</ins><span class="cx"> // Set up the disk caching callback to create the ShareableResource and send it to the WebProcess.
</span><span class="cx"> CFCachedURLResponseCallBackBlock block = ^(CFCachedURLResponseRef cachedResponse)
</span><span class="cx"> {
</span><span class="lines">@@ -96,10 +105,10 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if USE(WEB_THREAD)
</span><del>- CFCachedURLResponseCallBackBlock blockToRun = ^ (CFCachedURLResponseRef response)
</del><ins>+ CFCachedURLResponseCallBackBlock blockToRun = ^(CFCachedURLResponseRef response)
</ins><span class="cx"> {
</span><span class="cx"> CFRetain(response);
</span><del>- WebThreadRun(^ {
</del><ins>+ WebThreadRun(^{
</ins><span class="cx"> block(response);
</span><span class="cx"> CFRelease(response);
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>