Changeset 15213 in webkit for trunk/JavaScriptCore/API/JSClassRef.cpp

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):

File:

• trunk/JavaScriptCore/API/JSClassRef.cpp (modified) (4 diffs)

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;