diff options
| author | Sami Rosendahl <ext-sami.1.rosendahl@nokia.com> | 2011-12-07 13:57:18 +0100 |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2011-12-07 13:58:19 +0100 |
| commit | b070ad6a9804b6a7387f848c2e1721c16b8ccc62 (patch) | |
| tree | 547b600018b478e1167d553ccf7ef1e18ea65605 /src/network/access/qnetworkaccesshttpbackend.cpp | |
| parent | f86ca84e783c34e701f3742902161cb365e6e940 (diff) | |
Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny
Several crash backtraces point to crash in QHttpNetworkReply::readAny,
where d->connection==0. This patch adds a check for d->connection to
QNetworkAccessHttpBackend. If the connection is found to be destroyed,
the request is finished.
Does not need to be merged to 4.8 because the internals have changed
(Peter Hartmann)
PMO 290352
Merge-request: 1491
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src/network/access/qnetworkaccesshttpbackend.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccesshttpbackend.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp index aa477fbd4d..42dc33dd76 100644 --- a/src/network/access/qnetworkaccesshttpbackend.cpp +++ b/src/network/access/qnetworkaccesshttpbackend.cpp @@ -721,6 +721,12 @@ void QNetworkAccessHttpBackend::readFromHttp() if (!httpReply) return; + if (!http) { + // Connection has been destroyed + finished(); + return; + } + // We read possibly more than nextDownstreamBlockSize(), but // this is not a critical thing since it is already in the // memory anyway |