<!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>[164089] 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/164089">164089</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-02-13 18:42:10 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>The JSContainerConvertor and ObjcContainerConvertor need to protect JSValueRefs. Part 2.
<https://webkit.org/b/128764>
Reviewed by Mark Hahnenberg.
toJS() is the wrong cast function to use. We need to use toJSForGC() instead.
Also we need to acquire the JSLock to prevent concurrent accesses to the
Strong handle list.
* API/JSValue.mm:
(JSContainerConvertor::add):
(containerValueToObject):
(ObjcContainerConvertor::add):
(objectToValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSValuemm">trunk/Source/JavaScriptCore/API/JSValue.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSValuemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSValue.mm (164088 => 164089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSValue.mm 2014-02-14 02:36:44 UTC (rev 164088)
+++ trunk/Source/JavaScriptCore/API/JSValue.mm 2014-02-14 02:42:10 UTC (rev 164089)
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> void JSContainerConvertor::add(Task task)
</span><span class="cx"> {
</span><span class="cx"> JSC::ExecState* exec = toJS(m_context);
</span><del>- m_jsValues.append(JSC::Strong<JSC::Unknown>(exec->vm(), toJS(exec, task.js)));
</del><ins>+ m_jsValues.append(JSC::Strong<JSC::Unknown>(exec->vm(), toJSForGC(exec, task.js)));
</ins><span class="cx"> m_objectMap.add(task.js, task.objc);
</span><span class="cx"> if (task.type != ContainerNone)
</span><span class="cx"> m_worklist.append(task);
</span><span class="lines">@@ -672,6 +672,7 @@
</span><span class="cx"> static id containerValueToObject(JSGlobalContextRef context, JSContainerConvertor::Task task)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(task.type != ContainerNone);
</span><ins>+ JSC::APIEntryShim entryShim(toJS(context));
</ins><span class="cx"> JSContainerConvertor convertor(context);
</span><span class="cx"> convertor.add(task);
</span><span class="cx"> ASSERT(!convertor.isWorkListEmpty());
</span><span class="lines">@@ -841,7 +842,7 @@
</span><span class="cx"> void ObjcContainerConvertor::add(ObjcContainerConvertor::Task task)
</span><span class="cx"> {
</span><span class="cx"> JSC::ExecState* exec = toJS(m_context.JSGlobalContextRef);
</span><del>- m_jsValues.append(JSC::Strong<JSC::Unknown>(exec->vm(), toJS(exec, task.js)));
</del><ins>+ m_jsValues.append(JSC::Strong<JSC::Unknown>(exec->vm(), toJSForGC(exec, task.js)));
</ins><span class="cx"> m_objectMap.add(task.objc, task.js);
</span><span class="cx"> if (task.type != ContainerNone)
</span><span class="cx"> m_worklist.append(task);
</span><span class="lines">@@ -921,6 +922,7 @@
</span><span class="cx"> if (task.type == ContainerNone)
</span><span class="cx"> return task.js;
</span><span class="cx">
</span><ins>+ JSC::APIEntryShim entryShim(toJS(contextRef));
</ins><span class="cx"> ObjcContainerConvertor convertor(context);
</span><span class="cx"> convertor.add(task);
</span><span class="cx"> ASSERT(!convertor.isWorkListEmpty());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164088 => 164089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-14 02:36:44 UTC (rev 164088)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-14 02:42:10 UTC (rev 164089)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-13 Mark Lam <mark.lam@apple.com>
+
+ The JSContainerConvertor and ObjcContainerConvertor need to protect JSValueRefs. Part 2.
+ <https://webkit.org/b/128764>
+
+ Reviewed by Mark Hahnenberg.
+
+ toJS() is the wrong cast function to use. We need to use toJSForGC() instead.
+ Also we need to acquire the JSLock to prevent concurrent accesses to the
+ Strong handle list.
+
+ * API/JSValue.mm:
+ (JSContainerConvertor::add):
+ (containerValueToObject):
+ (ObjcContainerConvertor::add):
+ (objectToValue):
+
</ins><span class="cx"> 2014-02-13 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> JSManagedValue::dealloc modifies NSMapTable while iterating it
</span></span></pre>
</div>
</div>
</body>
</html>