Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Add missing checks for httpReply in QNetworkHttpBackend.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index abef8ab..aa477fb 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -737,7 +737,7 @@ void QNetworkAccessHttpBackend::readFromHttp()
 
 void QNetworkAccessHttpBackend::replyFinished()
 {
-    if (httpReply->bytesAvailable())
+    if (!httpReply || httpReply->bytesAvailable())
         // we haven't read everything yet. Wait some more.
         return;
 
@@ -788,6 +788,9 @@ void QNetworkAccessHttpBackend::checkForRedirect(const int statusCode)
 
 void QNetworkAccessHttpBackend::replyHeaderChanged()
 {
+    if (!httpReply)
+        return;
+
     setAttribute(QNetworkRequest::HttpPipeliningWasUsedAttribute, httpReply->isPipeliningUsed());
 
     // reconstruct the HTTP header
@@ -1128,7 +1131,7 @@ bool QNetworkAccessHttpBackend::canResume() const
         return false;
 
     // Can only resume if server/resource supports Range header.
-    if (httpReply->headerField("Accept-Ranges", "none") == "none")
+    if (!httpReply || httpReply->headerField("Accept-Ranges", "none") == "none")
         return false;
 
     // We only support resuming for byte ranges.