[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/KDE/4.10] kio/kio: Always return a valid QNetworkReply instead of NULLPTR
From:       Stefan_Brüns <stefan.bruens () rwth-aachen ! de>
Date:       2012-09-23 22:27:12
Message-ID: 20120923222712.C85FFA6094 () git ! kde ! org
[Download RAW message or body]

Git commit 098fed426b5936069e64141d1e4ca2082c28ce19 by Stefan Brüns.
Committed on 24/09/2012 at 00:26.
Pushed by bruns into branch 'KDE/4.10'.

Always return a valid QNetworkReply instead of NULLPTR

Even when the request fails, a valid reply should be returned.
At least WebCore crashes if the Accessmanager::createRequest(..)
returns 0.

REVIEW: 106502
BUG: 259883
BUG: 305516

M  +1    -1    kio/kio/accessmanager.cpp

http://commits.kde.org/kdelibs/098fed426b5936069e64141d1e4ca2082c28ce19

diff --git a/kio/kio/accessmanager.cpp b/kio/kio/accessmanager.cpp
index c27d90d..7a806e8 100644
--- a/kio/kio/accessmanager.cpp
+++ b/kio/kio/accessmanager.cpp
@@ -332,7 +332,7 @@ QNetworkReply *AccessManager::createRequest(Operation op, const \
QNetworkRequest  kDebug(7044) << "Synchronous XHR:" << reply << reqUrl;
         } else {
             kWarning(7044) << "Failed to create a synchronous XHR for" << reqUrl;
-            reply = 0;
+            reply = new KDEPrivate::AccessManagerReply(op, req, \
QNetworkReply::UnknownNetworkError, kioJob->errorText(), this);  }
     } else {
         // Set the window on the the KIO ui delegate


[prev in list] [next in list] [prev in thread] [next in thread]