Changeset 164077 in webkit

Timestamp:

Feb 13, 2014 5:06:53 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

The JSContainerConvertor and ObjcContainerConvertor need to protect JSValueRefs.
<​https://webkit.org/b/128764>

Reviewed by Mark Hahnenberg.

Added a vector of Strong<Unknown> references in the 2 containers, and append
the newly created JSValues to those vectors. This will keep all those JS objects
alive for the duration of the conversion.

• API/JSValue.mm:

(JSContainerConvertor::add):
(ObjcContainerConvertor::add):

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSValue.mm (modified) (5 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSValue.mm

@@ -38 +38 @@
 #import "JSCInlines.h"
 #import "JSCJSValue.h"
+#import "Strong.h"
 #import <wtf/HashMap.h>
 #import <wtf/HashSet.h>
@@ -596 +597 @@
     HashMap<JSValueRef, id> m_objectMap;
     Vector<Task> m_worklist;
+    Vector<JSC::Strong<JSC::Unknown>> m_jsValues;
 };
 
@@ -612 +614 @@
 void JSContainerConvertor::add(Task task)
 {
+    JSC::ExecState* exec = toJS(m_context);
+    m_jsValues.append(JSC::Strong<JSC::Unknown>(exec->vm(), toJS(exec, task.js)));
     m_objectMap.add(task.js, task.objc);
     if (task.type != ContainerNone)
@@ -818 +822 @@
     HashMap<id, JSValueRef> m_objectMap;
     Vector<Task> m_worklist;
+    Vector<JSC::Strong<JSC::Unknown>> m_jsValues;
 };
 
@@ -835 +840 @@
 void ObjcContainerConvertor::add(ObjcContainerConvertor::Task task)
 {
+    JSC::ExecState* exec = toJS(m_context.JSGlobalContextRef);
+    m_jsValues.append(JSC::Strong<JSC::Unknown>(exec->vm(), toJS(exec, task.js)));
     m_objectMap.add(task.objc, task.js);
     if (task.type != ContainerNone)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-02-13  Mark Lam  <mark.lam@apple.com>
+
+        The JSContainerConvertor and ObjcContainerConvertor need to protect JSValueRefs.
+        <https://webkit.org/b/128764>
+
+        Reviewed by Mark Hahnenberg.
+
+        Added a vector of Strong<Unknown> references in the 2 containers, and append
+        the newly created JSValues to those vectors. This will keep all those JS objects
+        alive for the duration of the conversion.
+
+        * API/JSValue.mm:
+        (JSContainerConvertor::add):
+        (ObjcContainerConvertor::add):
+
 2014-02-13  Matthew Mirman  <mmirman@apple.com>