[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 45ba1c7c7665ce3c4fc825858aa6963af35dad39
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 03:09:25 2010 +0000

    2010-02-09  Anton Muhin  <antonm at chromium.org>
    
            Reviewed by Nate Chapin.
    
            [v8] Check if returned wrapper is empty before operating on it.
            https://bugs.webkit.org/show_bug.cgi?id=34746
    
            * bindings/v8/custom/V8DocumentCustom.cpp:
            (WebCore::toV8):
            * bindings/v8/custom/V8HTMLDocumentCustom.cpp:
            (WebCore::toV8):
            * bindings/v8/custom/V8SVGDocumentCustom.cpp:
            (WebCore::toV8):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a096caa..d0f88f9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-09  Anton Muhin  <antonm at chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [v8] Check if returned wrapper is empty before operating on it.
+        https://bugs.webkit.org/show_bug.cgi?id=34746
+
+        * bindings/v8/custom/V8DocumentCustom.cpp:
+        (WebCore::toV8):
+        * bindings/v8/custom/V8HTMLDocumentCustom.cpp:
+        (WebCore::toV8):
+        * bindings/v8/custom/V8SVGDocumentCustom.cpp:
+        (WebCore::toV8):
+
 2010-02-09  Mikhail Naganov  <mnaganov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
index 1ac16b2..9a086cc 100644
--- a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
@@ -145,6 +145,8 @@ v8::Handle<v8::Value> toV8(Document* impl, bool forceNewObject)
     if (impl->isSVGDocument())
         return toV8(static_cast<SVGDocument*>(impl), forceNewObject);
     v8::Handle<v8::Value> wrapper = V8Document::wrap(impl, forceNewObject);
+    if (wrapper.IsEmpty())
+        return wrapper;
     if (!V8IsolatedContext::getEntered()) {
         if (V8Proxy* proxy = V8Proxy::retrieve(impl->frame()))
             proxy->windowShell()->updateDocumentWrapper(wrapper);
diff --git a/WebCore/bindings/v8/custom/V8HTMLDocumentCustom.cpp b/WebCore/bindings/v8/custom/V8HTMLDocumentCustom.cpp
index 6478e07..86f2eb5 100644
--- a/WebCore/bindings/v8/custom/V8HTMLDocumentCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8HTMLDocumentCustom.cpp
@@ -204,6 +204,8 @@ v8::Handle<v8::Value> toV8(HTMLDocument* impl, bool forceNewObject)
     if (!impl)
         return v8::Null();
     v8::Handle<v8::Object> wrapper = V8HTMLDocument::wrap(impl, forceNewObject);
+    if (wrapper.IsEmpty())
+        return wrapper;
     if (!V8IsolatedContext::getEntered()) {
         if (V8Proxy* proxy = V8Proxy::retrieve(impl->frame()))
             proxy->windowShell()->updateDocumentWrapper(wrapper);
diff --git a/WebCore/bindings/v8/custom/V8SVGDocumentCustom.cpp b/WebCore/bindings/v8/custom/V8SVGDocumentCustom.cpp
index 4cefc0e..558c03b 100644
--- a/WebCore/bindings/v8/custom/V8SVGDocumentCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8SVGDocumentCustom.cpp
@@ -41,6 +41,8 @@ v8::Handle<v8::Value> toV8(SVGDocument* impl, bool forceNewObject)
     if (!impl)
         return v8::Null();
     v8::Handle<v8::Object> wrapper = V8SVGDocument::wrap(impl, forceNewObject);
+    if (wrapper.IsEmpty())
+        return wrapper;
     if (!V8IsolatedContext::getEntered()) {
         if (V8Proxy* proxy = V8Proxy::retrieve(impl->frame()))
             proxy->windowShell()->updateDocumentWrapper(wrapper);

-- 
WebKit Debian packaging