Changeset 51333 in webkit for trunk/JavaScriptCore/API

Timestamp:

Nov 23, 2009, 6:24:46 PM (16 years ago)

Author:

[email protected]

Message:

Unreviewed. Unbreak the regression tests after r51329.

• API/JSBase.cpp:

(JSEvaluateScript): Null-check clientData before dereferencing it.

• API/JSObjectRef.cpp:

(JSObjectCallAsFunction): Ditto.

Location:

trunk/JavaScriptCore/API

Files:

• JSBase.cpp (modified) (2 diffs)
• JSObjectRef.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSBase.cpp

@@ -47 +47 @@
     JSLock lock(exec);
 
-    exec->globalData().clientData->willExecute(exec);
+    if (JSGlobalData::ClientData* clientData = exec->globalData().clientData)
+        clientData->willExecute(exec);
 
     JSObject* jsThisObject = toJS(thisObject);
@@ -65 +66 @@
         result = toRef(exec, jsUndefined());
 
-    exec->globalData().clientData->didExecute(exec);
+    if (JSGlobalData::ClientData* clientData = exec->globalData().clientData)
+        clientData->didExecute(exec);
     return result;
 }

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -393 +393 @@
     JSLock lock(exec);
 
-    exec->globalData().clientData->willExecute(exec);
+    if (JSGlobalData::ClientData* clientData = exec->globalData().clientData)
+        clientData->willExecute(exec);
 
     JSObject* jsObject = toJS(object);
@@ -419 +420 @@
     }
 
-    exec->globalData().clientData->didExecute(exec);
+    if (JSGlobalData::ClientData* clientData = exec->globalData().clientData)
+        clientData->didExecute(exec);
     return result;
 }