Changeset 15213 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 7, 2006, 1:41:27 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by John.

• Fixed a few crashes resulting from NULL parameters to JSClassCreate.

• API/JSClassRef.cpp: (JSClassCreate): (JSClassRelease):
• API/testapi.c: Added test for NULL parameters. (main):

Location:

trunk/JavaScriptCore

Files:

• API/JSClassRef.cpp (modified) (4 diffs)
• API/testapi.c (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/JavaScriptCore/API/JSClassRef.cpp

@@ -38 +38 @@
     if (staticValues) {
         jsClass->staticValues = new __JSClass::StaticValuesTable();
-        while (staticValues->name != 0) {
+        while (staticValues->name) {
             jsClass->staticValues->add(Identifier(staticValues->name).ustring().rep(), 
                                        new StaticValueEntry(staticValues->getProperty, staticValues->setProperty, staticValues->attributes));
@@ -47 +47 @@
     if (staticFunctions) {
         jsClass->staticFunctions = new __JSClass::StaticFunctionsTable();
-        while (staticFunctions->name != 0) {
+        while (staticFunctions->name) {
             jsClass->staticFunctions->add(Identifier(staticFunctions->name).ustring().rep(), 
                                           new StaticFunctionEntry(staticFunctions->callAsFunction, staticFunctions->attributes));
@@ -54 +54 @@
     }
     
-    jsClass->callbacks = *callbacks;
+    if (callbacks)
+        jsClass->callbacks = *callbacks;
+    else
+        jsClass->callbacks = kJSObjectCallbacksNone;
+    
     jsClass->parent = parentClass;
     
@@ -69 +73 @@
 {
     if (--jsClass->refCount == 0) {
-        deleteAllValues(*jsClass->staticValues);
-        delete jsClass->staticValues;
+        if (jsClass->staticValues) {
+            deleteAllValues(*jsClass->staticValues);
+            delete jsClass->staticValues;
+        }
 
-        deleteAllValues(*jsClass->staticFunctions);
-        delete jsClass->staticFunctions;
+        if (jsClass->staticFunctions) {
+            deleteAllValues(*jsClass->staticFunctions);
+            delete jsClass->staticFunctions;
+        }
 
         delete jsClass;

trunk/JavaScriptCore/API/testapi.c

@@ -565 +565 @@
     JSStringBufferRelease(myConstructorBuf);
 
+    JSClassRef nullCallbacksClass = JSClassCreate(context, NULL, NULL, NULL, NULL);
+    JSClassRelease(nullCallbacksClass);
+    
     char* script = createStringWithContentsOfFile("testapi.js");
     JSStringBufferRef scriptBuf = JSStringBufferCreateUTF8(script);

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-07-07  Geoffrey Garen  <[email protected]>
+
+        Reviewed by John.
+        
+        - Fixed a few crashes resulting from NULL parameters to JSClassCreate.
+
+        * API/JSClassRef.cpp:
+        (JSClassCreate):
+        (JSClassRelease):
+        * API/testapi.c: Added test for NULL parameters.
+        (main):
+
 2006-07-07  Geoffrey Garen  <[email protected]>