Changeset 43692 in webkit for trunk/JavaScriptCore/API/tests/testapi.c

Timestamp:

May 14, 2009, 4:14:52 AM (16 years ago)

Author:

[email protected]

Message:

Fix <​https://bugs.webkit.org/show_bug.cgi?id=25785>. Bug 25785: Segfault in mark when using JSObjectMakeConstructor

Reviewed by Oliver Hunt.

• API/JSObjectRef.cpp:

(JSObjectMakeConstructor): OpaqueJSClass::prototype can return 0. We need to use the default object prototype when it does.

• API/tests/testapi.c:

(main): Add a test case.

• runtime/JSObject.h:

(JSC::JSObject::putDirect): Add a clearer assertion for a null value. The assertion on the next line does catch this,
but the cause of the failure is not clear from the assertion itself.

File:

• trunk/JavaScriptCore/API/tests/testapi.c (modified) (2 diffs)

trunk/JavaScriptCore/API/tests/testapi.c

@@ -1137 +1137 @@
     JSStringRelease(script);
 
+    // Verify that creating a constructor for a class with no static functions does not trigger
+    // an assert inside putDirect or lead to a crash during GC. <https://bugs.webkit.org/show_bug.cgi?id=25785>
+    nullDefinition = kJSClassDefinitionEmpty;
+    nullClass = JSClassCreate(&nullDefinition);
+    myConstructor = JSObjectMakeConstructor(context, nullClass, 0);
+    JSClassRelease(nullClass);
+
     char* scriptUTF8 = createStringWithContentsOfFile(scriptPath);
     if (!scriptUTF8) {
@@ -1164 +1171 @@
     o = NULL;
     globalObject = NULL;
+    myConstructor = NULL;
 
     JSStringRelease(jsEmptyIString);