<!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>[225253] trunk/Source/WebKit</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/225253">225253</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-11-28 18:23:38 -0800 (Tue, 28 Nov 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>NetworkCache::Storage should protect itself when removing operations from its maps
https://bugs.webkit.org/show_bug.cgi?id=180118

Patch by Youenn Fablet <youenn@apple.com> on 2017-11-28
Reviewed by Antti Koivisto.

The operations can contain ref to the Storage object and removing them from the map may destroy the Storage object

* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::remove):
(WebKit::NetworkCache::Storage::finishReadOperation):
(WebKit::NetworkCache::Storage::finishWriteOperation):
(WebKit::NetworkCache::Storage::traverse):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (225252 => 225253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2017-11-29 02:06:22 UTC (rev 225252)
+++ trunk/Source/WebKit/ChangeLog       2017-11-29 02:23:38 UTC (rev 225253)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-11-28  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><ins>+        NetworkCache::Storage should protect itself when removing operations from its maps
+        https://bugs.webkit.org/show_bug.cgi?id=180118
+
+        Reviewed by Antti Koivisto.
+
+        The operations can contain ref to the Storage object and removing them from the map may destroy the Storage object
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::remove):
+        (WebKit::NetworkCache::Storage::finishReadOperation):
+        (WebKit::NetworkCache::Storage::finishWriteOperation):
+        (WebKit::NetworkCache::Storage::traverse):
+
+2017-11-28  Youenn Fablet  <youenn@apple.com>
+
</ins><span class="cx">         Register Documents as ServiceWorker clients to the StorageProcess
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=180047
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp (225252 => 225253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp 2017-11-29 02:06:22 UTC (rev 225252)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp    2017-11-29 02:23:38 UTC (rev 225253)
</span><span class="lines">@@ -561,6 +561,8 @@
</span><span class="cx">     if (!mayContain(key))
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    auto protectedThis = makeRef(*this);
+
</ins><span class="cx">     // We can't remove the key from the Bloom filter (but some false positives are expected anyway).
</span><span class="cx">     // For simplicity we also don't reduce m_approximateSize on removals.
</span><span class="cx">     // The next synchronization will update everything.
</span><span class="lines">@@ -567,7 +569,7 @@
</span><span class="cx"> 
</span><span class="cx">     removeFromPendingWriteOperations(key);
</span><span class="cx"> 
</span><del>-    serialBackgroundIOQueue().dispatch([this, protectedThis = makeRef(*this), key] () mutable {
</del><ins>+    serialBackgroundIOQueue().dispatch([this, protectedThis = WTFMove(protectedThis), key] () mutable {
</ins><span class="cx">         deleteFiles(key);
</span><span class="cx">         RunLoop::main().dispatch([protectedThis = WTFMove(protectedThis)] { });
</span><span class="cx">     });
</span><span class="lines">@@ -666,6 +668,8 @@
</span><span class="cx">         else if (!readOperation.isCanceled)
</span><span class="cx">             remove(readOperation.key);
</span><span class="cx"> 
</span><ins>+        auto protectedThis = makeRef(*this);
+
</ins><span class="cx">         ASSERT(m_activeReadOperations.contains(&readOperation));
</span><span class="cx">         m_activeReadOperations.remove(&readOperation);
</span><span class="cx"> 
</span><span class="lines">@@ -794,6 +798,8 @@
</span><span class="cx">     if (--writeOperation.activeCount)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    auto protectedThis = makeRef(*this);
+
</ins><span class="cx">     m_activeWriteOperations.remove(&writeOperation);
</span><span class="cx">     dispatchPendingWriteOperations();
</span><span class="cx"> 
</span><span class="lines">@@ -915,6 +921,9 @@
</span><span class="cx">         }
</span><span class="cx">         RunLoop::main().dispatch([this, &traverseOperation] {
</span><span class="cx">             traverseOperation.handler(nullptr, { });
</span><ins>+
+            auto protectedThis = makeRef(*this);
+
</ins><span class="cx">             m_activeTraverseOperations.remove(&traverseOperation);
</span><span class="cx">         });
</span><span class="cx">     });
</span></span></pre>
</div>
</div>

</body>
</html>