Changeset 148062 in webkit

Timestamp:

Apr 9, 2013 4:28:59 PM (11 years ago)

Author:

oliver@apple.com

Message:

Add liveness tests to JSC API entry points
​https://bugs.webkit.org/show_bug.cgi?id=114318

Reviewed by Filip Pizlo.

Add simple checks for the existence of a method table on any
JSCells passed across the API. This in turn forces a structure
validity test.

• API/APICast.h:

(toJS):
(toJSForGC):

Location:

trunk/Source/JavaScriptCore

Files:

• API/APICast.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/APICast.h

@@ -68 +68 @@
     if (!jsCell)
         return JSC::jsNull();
+    JSC::JSValue result;
     if (jsCell->isAPIValueWrapper())
-        return JSC::jsCast<JSC::JSAPIValueWrapper*>(jsCell)->value();
-    return jsCell;
+        result = JSC::jsCast<JSC::JSAPIValueWrapper*>(jsCell)->value();
+    else
+        result = jsCell;
 #else
     JSC::JSValue result = JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
+#endif
     if (!result)
         return JSC::jsNull();
+    if (result.isCell())
+        RELEASE_ASSERT(result.asCell()->methodTable());
     return result;
-#endif
 }
 
@@ -86 +90 @@
     if (!jsCell)
         return JSC::JSValue();
-    return jsCell;
+    JSC::JSValue result = jsCell;
 #else
-    return JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
+    JSC::JSValue result = JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
 #endif
+    if (result && result.isCell())
+        RELEASE_ASSERT(result.asCell()->methodTable());
+    return result;
 }
 
 inline JSC::JSObject* toJS(JSObjectRef o)
 {
-    return reinterpret_cast<JSC::JSObject*>(o);
+    JSC::JSObject* object = reinterpret_cast<JSC::JSObject*>(o);
+    if (object)
+        RELEASE_ASSERT(object->methodTable());
+    return object;
 }
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-04-09  Oliver Hunt  <oliver@apple.com>
+
+        Add liveness tests to JSC API entry points
+        https://bugs.webkit.org/show_bug.cgi?id=114318
+
+        Reviewed by Filip Pizlo.
+
+        Add simple checks for the existence of a method table on any
+        JSCells passed across the API.  This in turn forces a structure
+        validity test.
+
+        * API/APICast.h:
+        (toJS):
+        (toJSForGC):
+
 2013-04-09  Balazs Kilvady  <kilvadyb@homejinni.com>