[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b994cb8550f4b62542346938d3259614ff81f7b4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 21 06:03:08 2010 +0000

    2010-11-20  Sam Magnuson  <smagnuso at gmail.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] crash when attempting to add a JS object
            https://bugs.webkit.org/show_bug.cgi?id=49287
    
            * Api/qwebframe.cpp:
            (QWebFrame::addToJavaScriptWindowObject):
    
            Test: LayoutTests/fast/frames/sandboxed-iframe-plugins.html
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72491 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 203bd60..eb7a85f 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -558,6 +558,10 @@ void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object
         qDebug() << "Warning: couldn't get window object";
         return;
     }
+    if (!root) {
+        qDebug() << "Warning: couldn't get root object";
+        return;
+    }
 
     JSC::ExecState* exec = window->globalExec();
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 83ced7f..4c428e9 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-20  Sam Magnuson  <smagnuso at gmail.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] crash when attempting to add a JS object
+        https://bugs.webkit.org/show_bug.cgi?id=49287
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::addToJavaScriptWindowObject):
+
+        Test: LayoutTests/fast/frames/sandboxed-iframe-plugins.html
+
 2010-11-20  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r72471.

-- 
WebKit Debian packaging