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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 25473b5fdf24ec5243423300d107582c75f59239
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 25 16:51:13 2010 +0000

    2010-11-25  Andreas Kling  <kling at webkit.org>
    
            Unreviewed crash fix for Qt 4.6.x.
    
            Check that QNetworkReplyHandler::reply() doesn't return null before
            using it (this code needs to work for Qt 4.6 as well.)
    
            * platform/network/qt/ResourceHandleQt.cpp:
            (WebCore::ResourceHandle::loadResourceSynchronously):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72734 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1f2e0eb..2c71cef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-25  Andreas Kling  <kling at webkit.org>
+
+        Unreviewed crash fix for Qt 4.6.x.
+
+        Check that QNetworkReplyHandler::reply() doesn't return null before
+        using it (this code needs to work for Qt 4.6 as well.)
+
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+
 2010-11-25  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r72727.
diff --git a/WebCore/platform/network/qt/ResourceHandleQt.cpp b/WebCore/platform/network/qt/ResourceHandleQt.cpp
index 46d544d..41ed1b1 100644
--- a/WebCore/platform/network/qt/ResourceHandleQt.cpp
+++ b/WebCore/platform/network/qt/ResourceHandleQt.cpp
@@ -211,7 +211,7 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const
 
     QNetworkReply* reply = d->m_job->reply();
     // When using synchronous calls, we are finished when reaching this point.
-    if (reply->isFinished()) {
+    if (reply && reply->isFinished()) {
         syncLoader.setReplyFinished(true);
         d->m_job->forwardData();
         d->m_job->finish();

-- 
WebKit Debian packaging