diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-07 13:15:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-07 13:15:39 (GMT) |
| commit | dc9c4a91b01a1f0d05f2a62d420721b6b2be987e (patch) | |
| tree | 47bf90eef8b3521b21525fb69e962e9d435a81e3 /src | |
| parent | f485ac02b057cb076c965c3cd1bd9c78aaa5a696 (diff) | |
| parent | b070ad6a9804b6a7387f848c2e1721c16b8ccc62 (diff) | |
| download | Qt-dc9c4a91b01a1f0d05f2a62d420721b6b2be987e.zip Qt-dc9c4a91b01a1f0d05f2a62d420721b6b2be987e.tar.gz Qt-dc9c4a91b01a1f0d05f2a62d420721b6b2be987e.tar.bz2 | |
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:
Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny
Diffstat (limited to 'src')
| -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 aa477fb..42dc33d 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 |