[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 83bc99fb18e32a383875b377785a1b11e5cc26bb
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 24 02:24:46 2009 +0000

    Unreviewed. Unbreak the regression tests after r51329.
    
    * API/JSBase.cpp:
    (JSEvaluateScript): Null-check clientData before dereferencing it.
    * API/JSObjectRef.cpp:
    (JSObjectCallAsFunction): Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51333 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/API/JSBase.cpp b/JavaScriptCore/API/JSBase.cpp
index 8678238..e7a1600 100644
--- a/JavaScriptCore/API/JSBase.cpp
+++ b/JavaScriptCore/API/JSBase.cpp
@@ -46,7 +46,8 @@ JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef th
     exec->globalData().heap.registerThread();
     JSLock lock(exec);
 
-    exec->globalData().clientData->willExecute(exec);
+    if (JSGlobalData::ClientData* clientData = exec->globalData().clientData)
+        clientData->willExecute(exec);
 
     JSObject* jsThisObject = toJS(thisObject);
 
@@ -64,7 +65,8 @@ JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef th
     else // happens, for example, when the only statement is an empty (';') statement
         result = toRef(exec, jsUndefined());
 
-    exec->globalData().clientData->didExecute(exec);
+    if (JSGlobalData::ClientData* clientData = exec->globalData().clientData)
+        clientData->didExecute(exec);
     return result;
 }
 
diff --git a/JavaScriptCore/API/JSObjectRef.cpp b/JavaScriptCore/API/JSObjectRef.cpp
index 36e8c19..d3e3f56 100644
--- a/JavaScriptCore/API/JSObjectRef.cpp
+++ b/JavaScriptCore/API/JSObjectRef.cpp
@@ -392,7 +392,8 @@ JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObject
     exec->globalData().heap.registerThread();
     JSLock lock(exec);
 
-    exec->globalData().clientData->willExecute(exec);
+    if (JSGlobalData::ClientData* clientData = exec->globalData().clientData)
+        clientData->willExecute(exec);
 
     JSObject* jsObject = toJS(object);
     JSObject* jsThisObject = toJS(thisObject);
@@ -418,7 +419,8 @@ JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObject
         }
     }
 
-    exec->globalData().clientData->didExecute(exec);
+    if (JSGlobalData::ClientData* clientData = exec->globalData().clientData)
+        clientData->didExecute(exec);
     return result;
 }
 
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ae2f8f3..974da7d 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-23  Mark Rowe  <mrowe at apple.com>
+
+        Unreviewed. Unbreak the regression tests after r51329.
+
+        * API/JSBase.cpp:
+        (JSEvaluateScript): Null-check clientData before dereferencing it.
+        * API/JSObjectRef.cpp:
+        (JSObjectCallAsFunction): Ditto.
+
 2009-11-23  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Geoff Garen.

-- 
WebKit Debian packaging