<!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>[198565] trunk/Source/JavaScriptCore</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/198565">198565</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-03-22 17:19:47 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/197543">r197543</a>): Use-after-free on storage/indexeddb/transaction-abort-private.html
https://bugs.webkit.org/show_bug.cgi?id=155067
Reviewed by Filip Pizlo.
GCIncommingRefCountedSets need to be finalized before we start
destructing members of the Heap object. Previously, we would
clear all our ArrayBuffer objects when the GCIncommingRefCountedSet
holding them was destroyed. However, ArrayBuffers have a weak
reference to their wrappers. When we would attempt to destroy the
ArrayBuffer object we would end up accessing the WeakImpl for
the weak reference, which had already been freed as we destroyed
our weak block. The solution to this is to move the old
GCIncommingRefCountedSet destructor functionality to a new
function lastChanceToFinalize. This function is called when
we finalize our other objects on Heap destruction.
* heap/GCIncomingRefCountedSet.h:
* heap/GCIncomingRefCountedSetInlines.h:
(JSC::GCIncomingRefCountedSet<T>::lastChanceToFinalize):
(JSC::GCIncomingRefCountedSet<T>::~GCIncomingRefCountedSet): Deleted.
* heap/Heap.cpp:
(JSC::Heap::lastChanceToFinalize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCIncomingRefCountedSeth">trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSet.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCIncomingRefCountedSetInlinesh">trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSetInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198564 => 198565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-23 00:12:23 UTC (rev 198564)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-23 00:19:47 UTC (rev 198565)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-03-22 Keith Miller <keith_miller@apple.com>
+
+ REGRESSION(r197543): Use-after-free on storage/indexeddb/transaction-abort-private.html
+ https://bugs.webkit.org/show_bug.cgi?id=155067
+
+ Reviewed by Filip Pizlo.
+
+ GCIncommingRefCountedSets need to be finalized before we start
+ destructing members of the Heap object. Previously, we would
+ clear all our ArrayBuffer objects when the GCIncommingRefCountedSet
+ holding them was destroyed. However, ArrayBuffers have a weak
+ reference to their wrappers. When we would attempt to destroy the
+ ArrayBuffer object we would end up accessing the WeakImpl for
+ the weak reference, which had already been freed as we destroyed
+ our weak block. The solution to this is to move the old
+ GCIncommingRefCountedSet destructor functionality to a new
+ function lastChanceToFinalize. This function is called when
+ we finalize our other objects on Heap destruction.
+
+ * heap/GCIncomingRefCountedSet.h:
+ * heap/GCIncomingRefCountedSetInlines.h:
+ (JSC::GCIncomingRefCountedSet<T>::lastChanceToFinalize):
+ (JSC::GCIncomingRefCountedSet<T>::~GCIncomingRefCountedSet): Deleted.
+ * heap/Heap.cpp:
+ (JSC::Heap::lastChanceToFinalize):
+
</ins><span class="cx"> 2016-03-22 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] [64-bit] Remove MSVC 2013 FMA3 Bug Workaround
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCIncomingRefCountedSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSet.h (198564 => 198565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSet.h 2016-03-23 00:12:23 UTC (rev 198564)
+++ trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSet.h 2016-03-23 00:19:47 UTC (rev 198565)
</span><span class="lines">@@ -36,8 +36,9 @@
</span><span class="cx"> class GCIncomingRefCountedSet {
</span><span class="cx"> public:
</span><span class="cx"> GCIncomingRefCountedSet();
</span><del>- ~GCIncomingRefCountedSet();
-
</del><ins>+
+ void lastChanceToFinalize();
+
</ins><span class="cx"> // Returns true if the native object is new to this set.
</span><span class="cx"> bool addReference(JSCell*, T*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCIncomingRefCountedSetInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSetInlines.h (198564 => 198565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSetInlines.h 2016-03-23 00:12:23 UTC (rev 198564)
+++ trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSetInlines.h 2016-03-23 00:19:47 UTC (rev 198565)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>-GCIncomingRefCountedSet<T>::~GCIncomingRefCountedSet()
</del><ins>+void GCIncomingRefCountedSet<T>::lastChanceToFinalize()
</ins><span class="cx"> {
</span><span class="cx"> for (size_t i = m_vector.size(); i--;)
</span><span class="cx"> m_vector[i]->filterIncomingReferences(removeAll);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (198564 => 198565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-03-23 00:12:23 UTC (rev 198564)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-03-23 00:19:47 UTC (rev 198565)
</span><span class="lines">@@ -382,6 +382,7 @@
</span><span class="cx"> RELEASE_ASSERT(!m_vm->entryScope);
</span><span class="cx"> RELEASE_ASSERT(m_operationInProgress == NoOperation);
</span><span class="cx">
</span><ins>+ m_arrayBuffers.lastChanceToFinalize();
</ins><span class="cx"> m_codeBlocks.lastChanceToFinalize();
</span><span class="cx"> m_objectSpace.lastChanceToFinalize();
</span><span class="cx"> releaseDelayedReleasedObjects();
</span></span></pre>
</div>
</div>
</body>
</html>