[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hyatt at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit e71b43392ef7023d858b915e3d34f71656fa6518
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 21:57:18 2010 +0000

    Make sure to do a JSLock before deserialization of script values, since they can heap allocate.
    
    Reviewed by Oliver Hunt.
    
    * bindings/js/SerializedScriptValue.cpp:
    (WebCore::SerializedScriptValueData::deserialize):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53646 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 362c932..25c5a30 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-21  Dave Hyatt  <hyatt at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Make sure to do a JSLock before deserialization of script values, since they can heap allocate.
+
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValueData::deserialize):
+
 2010-01-21  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/bindings/js/SerializedScriptValue.cpp b/WebCore/bindings/js/SerializedScriptValue.cpp
index 7c4ad62..c30c571 100644
--- a/WebCore/bindings/js/SerializedScriptValue.cpp
+++ b/WebCore/bindings/js/SerializedScriptValue.cpp
@@ -32,6 +32,7 @@
 #include "JSFile.h"
 #include "JSFileList.h"
 #include <JavaScriptCore/APICast.h>
+#include <JavaScriptCore/JSLock.h>
 #include <runtime/DateInstance.h>
 #include <runtime/ExceptionHelpers.h>
 #include <runtime/PropertyNameArray.h>
@@ -704,6 +705,7 @@ private:
 
 JSValue SerializedScriptValueData::deserialize(ExecState* exec, bool mustCopy) const
 {
+    JSLock lock(SilenceAssertionsOnly);
     DeserializingTreeWalker context(exec, mustCopy);
     return walk<DeserializingTreeWalker>(context, *this);
 }

-- 
WebKit Debian packaging