<!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>[179702] 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/179702">179702</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-05 13:29:19 -0800 (Thu, 05 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Free memory read under MemoryCache::pruneLiveResourcesToSize()
https://bugs.webkit.org/show_bug.cgi?id=141292
<rdar://problem/19725522>
Reviewed by Antti Koivisto.
In MemoryCache::pruneLiveResourcesToSize(), we were iterating over the
m_liveDecodedResources ListHashSet and possibly calling
CachedResource::destroyDecodedData() on the current value. Doing so
would cause a call to ListHashSet::remove() to remove the value pointed
by the current iterator, thus invalidating our iterator.
In this patch, we increment the ListHashSet iterator *before* calling
CachedResource::destroyDecodedData(), while the current iterator is
still valid. Note that this is safe because unlike iteration of most
WTF Hash data structures, iteration is guaranteed safe against mutation
of the ListHashSet, except for removal of the item currently pointed to
by a given iterator.
Test: http/tests/cache/memory-cache-pruning.html
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::pruneLiveResourcesToSize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscachememorycachepruningexpectedtxt">trunk/LayoutTests/http/tests/cache/memory-cache-pruning-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscachememorycachepruninghtml">trunk/LayoutTests/http/tests/cache/memory-cache-pruning.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestshttptestscachememorycachepruningexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/memory-cache-pruning-expected.txt (0 => 179702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/memory-cache-pruning-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/cache/memory-cache-pruning-expected.txt 2015-02-05 21:29:19 UTC (rev 179702)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This test exercices the code path executed when the memory cache reaches its maximum size
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS previousSize > 0 is true
+PASS internals.memoryCacheSize() < previousSize is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachememorycachepruninghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/memory-cache-pruning.html (0 => 179702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/memory-cache-pruning.html (rev 0)
+++ trunk/LayoutTests/http/tests/cache/memory-cache-pruning.html 2015-02-05 21:29:19 UTC (rev 179702)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<link rel=stylesheet href=../css/resources/shared.css>
+<script src="../../js-test-resources/js-test-pre.js"></script>
+<script>
+function runTest() {
+ previousSize = internals.memoryCacheSize();
+ shouldBeTrue("previousSize > 0");
+ internals.pruneMemoryCacheToSize(0);
+ shouldBeTrue("internals.memoryCacheSize() < previousSize");
+ finishJSTest();
+}
+</script>
+</head>
+<body onload="runTest()">
+<img src="../resources/square100.png"/>
+<img src="../resources/square128.png"/>
+<audio src="../resources/test.mp4"></audio>
+<video src="../resources/test.mp4"></video>
+<script>
+description("This test exercices the code path executed when the memory cache reaches its maximum size");
+jsTestIsAsync = true;
+</script>
+<script src="../../js-test-resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179701 => 179702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-05 20:12:38 UTC (rev 179701)
+++ trunk/Source/WebCore/ChangeLog 2015-02-05 21:29:19 UTC (rev 179702)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-02-05 Chris Dumez <cdumez@apple.com>
+
+ Free memory read under MemoryCache::pruneLiveResourcesToSize()
+ https://bugs.webkit.org/show_bug.cgi?id=141292
+ <rdar://problem/19725522>
+
+ Reviewed by Antti Koivisto.
+
+ In MemoryCache::pruneLiveResourcesToSize(), we were iterating over the
+ m_liveDecodedResources ListHashSet and possibly calling
+ CachedResource::destroyDecodedData() on the current value. Doing so
+ would cause a call to ListHashSet::remove() to remove the value pointed
+ by the current iterator, thus invalidating our iterator.
+
+ In this patch, we increment the ListHashSet iterator *before* calling
+ CachedResource::destroyDecodedData(), while the current iterator is
+ still valid. Note that this is safe because unlike iteration of most
+ WTF Hash data structures, iteration is guaranteed safe against mutation
+ of the ListHashSet, except for removal of the item currently pointed to
+ by a given iterator.
+
+ Test: http/tests/cache/memory-cache-pruning.html
+
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::pruneLiveResourcesToSize):
+
</ins><span class="cx"> 2015-02-05 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] HLS <video> will not fire 'progress' events, only 'stalled'.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (179701 => 179702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-02-05 20:12:38 UTC (rev 179701)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-02-05 21:29:19 UTC (rev 179702)
</span><span class="lines">@@ -197,6 +197,8 @@
</span><span class="cx"> __ZN7WebCore11MemoryCache18resourceForRequestERKNS_15ResourceRequestENS_9SessionIDE
</span><span class="cx"> __ZN7WebCore11MemoryCache19getOriginsWithCacheERN3WTF7HashSetINS1_6RefPtrINS_14SecurityOriginEEENS_18SecurityOriginHashENS1_10HashTraitsIS5_EEEE
</span><span class="cx"> __ZN7WebCore11MemoryCache20removeImageFromCacheERKNS_3URLERKN3WTF6StringE
</span><ins>+__ZN7WebCore11MemoryCache24pruneDeadResourcesToSizeEj
+__ZN7WebCore11MemoryCache24pruneLiveResourcesToSizeEjb
</ins><span class="cx"> __ZN7WebCore11MemoryCache25removeResourcesWithOriginERNS_14SecurityOriginE
</span><span class="cx"> __ZN7WebCore11MemoryCache9singletonEv
</span><span class="cx"> __ZN7WebCore11PageOverlay15setNeedsDisplayERKNS_7IntRectE
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (179701 => 179702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-02-05 20:12:38 UTC (rev 179701)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-02-05 21:29:19 UTC (rev 179702)
</span><span class="lines">@@ -300,7 +300,18 @@
</span><span class="cx"> // elapsedTime will evaluate to false as the currentTime will be a lot
</span><span class="cx"> // greater than the current->m_lastDecodedAccessTime.
</span><span class="cx"> // For more details see: https://bugs.webkit.org/show_bug.cgi?id=30209
</span><del>- for (auto* current : m_liveDecodedResources) {
</del><ins>+ auto it = m_liveDecodedResources.begin();
+ while (it != m_liveDecodedResources.end()) {
+ auto* current = *it;
+
+ // Increment the iterator now because the call to destroyDecodedData() below
+ // may cause a call to ListHashSet::remove() and invalidate the current
+ // iterator. Note that this is safe because unlike iteration of most
+ // WTF Hash data structures, iteration is guaranteed safe against mutation
+ // of the ListHashSet, except for removal of the item currently pointed to
+ // by a given iterator.
+ ++it;
+
</ins><span class="cx"> ASSERT(current->hasClients());
</span><span class="cx"> if (current->isLoaded() && current->decodedSize()) {
</span><span class="cx"> // Check to see if the remaining resources are too new to prune.
</span><span class="lines">@@ -311,9 +322,8 @@
</span><span class="cx"> if (current->decodedDataIsPurgeable())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- // Destroy our decoded data. This will remove us from
- // m_liveDecodedResources, and possibly move us to a different LRU
- // list in m_allResources.
</del><ins>+ // Destroy our decoded data. This will remove us from m_liveDecodedResources, and possibly move us
+ // to a different LRU list in m_allResources.
</ins><span class="cx"> current->destroyDecodedData();
</span><span class="cx">
</span><span class="cx"> if (targetSize && m_liveSize <= targetSize)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (179701 => 179702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-02-05 20:12:38 UTC (rev 179701)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-02-05 21:29:19 UTC (rev 179702)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> class MemoryCache {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(MemoryCache); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> friend NeverDestroyed<MemoryCache>;
</span><del>-
</del><ins>+ friend class Internals;
</ins><span class="cx"> public:
</span><span class="cx"> struct TypeStatistic {
</span><span class="cx"> int count;
</span><span class="lines">@@ -117,6 +117,7 @@
</span><span class="cx"> WEBCORE_EXPORT void evictResources();
</span><span class="cx">
</span><span class="cx"> void prune();
</span><ins>+ unsigned size() const { return m_liveSize + m_deadSize; }
</ins><span class="cx">
</span><span class="cx"> void setDeadDecodedDataDeletionInterval(std::chrono::milliseconds interval) { m_deadDecodedDataDeletionInterval = interval; }
</span><span class="cx"> std::chrono::milliseconds deadDecodedDataDeletionInterval() const { return m_deadDecodedDataDeletionInterval; }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (179701 => 179702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-02-05 20:12:38 UTC (rev 179701)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-02-05 21:29:19 UTC (rev 179702)
</span><span class="lines">@@ -409,6 +409,17 @@
</span><span class="cx"> MemoryCache::singleton().evictResources();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::pruneMemoryCacheToSize(unsigned size)
+{
+ MemoryCache::singleton().pruneDeadResourcesToSize(size);
+ MemoryCache::singleton().pruneLiveResourcesToSize(size, true);
+}
+
+unsigned Internals::memoryCacheSize() const
+{
+ return MemoryCache::singleton().size();
+}
+
</ins><span class="cx"> Node* Internals::treeScopeRootNode(Node* node, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (!node) {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (179701 => 179702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-02-05 20:12:38 UTC (rev 179701)
+++ trunk/Source/WebCore/testing/Internals.h 2015-02-05 21:29:19 UTC (rev 179702)
</span><span class="lines">@@ -84,7 +84,10 @@
</span><span class="cx"> bool isPreloaded(const String& url);
</span><span class="cx"> bool isLoadingFromMemoryCache(const String& url);
</span><span class="cx"> String xhrResponseSource(XMLHttpRequest*);
</span><ins>+
</ins><span class="cx"> void clearMemoryCache();
</span><ins>+ void pruneMemoryCacheToSize(unsigned size);
+ unsigned memoryCacheSize() const;
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<CSSComputedStyleDeclaration> computedStyleIncludingVisitedInfo(Node*, ExceptionCode&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (179701 => 179702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-02-05 20:12:38 UTC (rev 179701)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-02-05 21:29:19 UTC (rev 179702)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> boolean isLoadingFromMemoryCache(DOMString url);
</span><span class="cx"> DOMString xhrResponseSource(XMLHttpRequest xhr);
</span><span class="cx"> void clearMemoryCache();
</span><ins>+ void pruneMemoryCacheToSize(long size);
+ long memoryCacheSize();
</ins><span class="cx">
</span><span class="cx"> [RaisesException] CSSStyleDeclaration computedStyleIncludingVisitedInfo(Node node);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>