[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 d0adec06bb38ac81aaed6ab49d689794429451e8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 14:50:51 2010 +0000

    2010-11-11  Yi Shen  <yi.4.shen at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] QWebScriptWorld::world() may crash
            https://bugs.webkit.org/show_bug.cgi?id=49342
    
            * Api/qwebscriptworld.cpp:
            (QWebScriptWorld::world):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71818 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebscriptworld.cpp b/WebKit/qt/Api/qwebscriptworld.cpp
index 74ab651..7a44813 100644
--- a/WebKit/qt/Api/qwebscriptworld.cpp
+++ b/WebKit/qt/Api/qwebscriptworld.cpp
@@ -50,7 +50,7 @@ QWebScriptWorld &QWebScriptWorld::operator=(const QWebScriptWorld& other)
 
 DOMWrapperWorld* QWebScriptWorld::world() const
 {
-    return d->world.get();
+    return d ? d->world.get() : 0;
 }
 
 /*!
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3b5523c..ca9942c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-11  Yi Shen  <yi.4.shen at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QWebScriptWorld::world() may crash
+        https://bugs.webkit.org/show_bug.cgi?id=49342
+
+        * Api/qwebscriptworld.cpp:
+        (QWebScriptWorld::world):
+
 2010-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Andreas Kling.

-- 
WebKit Debian packaging