<!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>[164147] 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/164147">164147</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 17:27:53 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>-[JSManagedValue value] needs to be protected by the API lock
https://bugs.webkit.org/show_bug.cgi?id=128857
Reviewed by Mark Lam.
* API/APICast.h:
(toRef): Added an ASSERT so that we can detect these sorts of errors earlier. On 32-bit, toRef
can allocate objects so we need to be holding the lock.
* API/APIShims.h: Removed outdated comments.
* API/JSManagedValue.mm: Added RefPtr<JSLock> to JSManagedValue.
(-[JSManagedValue initWithValue:]): Initialize the m_lock field.
(-[JSManagedValue value]): Lock the JSLock, check the VM*, return nil if invalid, take the APIEntryShim otherwise.
* runtime/JSLock.cpp: Bug fix in JSLock. We were assuming that the VM was always non-null in JSLock::lock.
(JSC::JSLock::lock):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIAPICasth">trunk/Source/JavaScriptCore/API/APICast.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIAPIShimsh">trunk/Source/JavaScriptCore/API/APIShims.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSManagedValuemm">trunk/Source/JavaScriptCore/API/JSManagedValue.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockcpp">trunk/Source/JavaScriptCore/runtime/JSLock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/APICast.h (164146 => 164147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/APICast.h 2014-02-15 01:06:42 UTC (rev 164146)
+++ trunk/Source/JavaScriptCore/API/APICast.h 2014-02-15 01:27:53 UTC (rev 164147)
</span><span class="lines">@@ -124,6 +124,7 @@
</span><span class="cx">
</span><span class="cx"> inline JSValueRef toRef(JSC::ExecState* exec, JSC::JSValue v)
</span><span class="cx"> {
</span><ins>+ ASSERT(exec->vm().currentThreadIsHoldingAPILock());
</ins><span class="cx"> #if USE(JSVALUE32_64)
</span><span class="cx"> if (!v)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIAPIShimsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/APIShims.h (164146 => 164147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/APIShims.h 2014-02-15 01:06:42 UTC (rev 164146)
+++ trunk/Source/JavaScriptCore/API/APIShims.h 2014-02-15 01:27:53 UTC (rev 164147)
</span><span class="lines">@@ -56,14 +56,12 @@
</span><span class="cx">
</span><span class="cx"> class APIEntryShim : public APIEntryShimWithoutLock {
</span><span class="cx"> public:
</span><del>- // Normal API entry
</del><span class="cx"> APIEntryShim(ExecState* exec, bool registerThread = true)
</span><span class="cx"> : APIEntryShimWithoutLock(&exec->vm(), registerThread)
</span><span class="cx"> , m_lockHolder(exec->vm().exclusiveThread ? 0 : exec)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // JSPropertyNameAccumulator only has a vm.
</del><span class="cx"> APIEntryShim(VM* vm, bool registerThread = true)
</span><span class="cx"> : APIEntryShimWithoutLock(vm, registerThread)
</span><span class="cx"> , m_lockHolder(vm->exclusiveThread ? 0 : vm)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSManagedValuemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSManagedValue.mm (164146 => 164147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSManagedValue.mm 2014-02-15 01:06:42 UTC (rev 164146)
+++ trunk/Source/JavaScriptCore/API/JSManagedValue.mm 2014-02-15 01:27:53 UTC (rev 164147)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if JSC_OBJC_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "APICast.h"
</span><ins>+#import "APIShims.h"
</ins><span class="cx"> #import "Heap.h"
</span><span class="cx"> #import "JSContextInternal.h"
</span><span class="cx"> #import "JSValueInternal.h"
</span><span class="lines">@@ -168,6 +169,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation JSManagedValue {
</span><span class="cx"> JSC::Weak<JSC::JSGlobalObject> m_globalObject;
</span><ins>+ RefPtr<JSC::JSLock> m_lock;
</ins><span class="cx"> WeakValueRef m_weakValue;
</span><span class="cx"> NSMapTable *m_owners;
</span><span class="cx"> }
</span><span class="lines">@@ -203,6 +205,8 @@
</span><span class="cx"> JSC::Weak<JSC::JSGlobalObject> weak(globalObject, managedValueHandleOwner(), self);
</span><span class="cx"> m_globalObject.swap(weak);
</span><span class="cx">
</span><ins>+ m_lock = &exec->vm().apiLock();
+
</ins><span class="cx"> NSPointerFunctionsOptions weakIDOptions = NSPointerFunctionsWeakMemory | NSPointerFunctionsObjectPersonality;
</span><span class="cx"> NSPointerFunctionsOptions integerOptions = NSPointerFunctionsOpaqueMemory | NSPointerFunctionsIntegerPersonality;
</span><span class="cx"> m_owners = [[NSMapTable alloc] initWithKeyOptions:weakIDOptions valueOptions:integerOptions capacity:1];
</span><span class="lines">@@ -258,6 +262,11 @@
</span><span class="cx">
</span><span class="cx"> - (JSValue *)value
</span><span class="cx"> {
</span><ins>+ WTF::Locker<JSC::JSLock> locker(m_lock.get());
+ if (!m_lock->vm())
+ return nil;
+
+ JSC::APIEntryShim shim(m_lock->vm());
</ins><span class="cx"> if (!m_globalObject)
</span><span class="cx"> return nil;
</span><span class="cx"> if (m_weakValue.isClear())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164146 => 164147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-15 01:06:42 UTC (rev 164146)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-15 01:27:53 UTC (rev 164147)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-14 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ -[JSManagedValue value] needs to be protected by the API lock
+ https://bugs.webkit.org/show_bug.cgi?id=128857
+
+ Reviewed by Mark Lam.
+
+ * API/APICast.h:
+ (toRef): Added an ASSERT so that we can detect these sorts of errors earlier. On 32-bit, toRef
+ can allocate objects so we need to be holding the lock.
+ * API/APIShims.h: Removed outdated comments.
+ * API/JSManagedValue.mm: Added RefPtr<JSLock> to JSManagedValue.
+ (-[JSManagedValue initWithValue:]): Initialize the m_lock field.
+ (-[JSManagedValue value]): Lock the JSLock, check the VM*, return nil if invalid, take the APIEntryShim otherwise.
+ * runtime/JSLock.cpp: Bug fix in JSLock. We were assuming that the VM was always non-null in JSLock::lock.
+ (JSC::JSLock::lock):
+
</ins><span class="cx"> 2014-02-14 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement a few more Array prototype functions in JS
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.cpp (164146 => 164147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-02-15 01:06:42 UTC (rev 164146)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-02-15 01:27:53 UTC (rev 164147)
</span><span class="lines">@@ -121,6 +121,9 @@
</span><span class="cx"> ASSERT(!m_lockCount);
</span><span class="cx"> m_lockCount = lockCount;
</span><span class="cx">
</span><ins>+ if (!m_vm)
+ return;
+
</ins><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span><span class="cx">
</span><span class="cx"> RELEASE_ASSERT(!m_vm->stackPointerAtVMEntry());
</span></span></pre>
</div>
</div>
</body>
</html>