diff options
author | Sami Rosendahl <sami.rosendahl@reaktor.fi> | 2011-11-11 12:17:54 (GMT) |
---|---|---|
committer | Peter Hartmann <peter.hartmann@nokia.com> | 2011-11-11 12:17:54 (GMT) |
commit | d278a522dc65046ad7215c333a4a1bf00c12196a (patch) | |
tree | 46e33330d8a24ecfc35fba56cdf677709b5a3694 /src/network | |
parent | 2c072ae53ea4f90a32cfb8260f1bd0251ebab4f9 (diff) | |
download | Qt-d278a522dc65046ad7215c333a4a1bf00c12196a.zip Qt-d278a522dc65046ad7215c333a4a1bf00c12196a.tar.gz Qt-d278a522dc65046ad7215c333a4a1bf00c12196a.tar.bz2 |
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
If a HTTP server responds with gzip-encoded empty content without defining
Content-Length in the response header QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
will crash because it calls zlib inflateEnd for an uninitialized stream.
- Fixed the crash by adding a check if the stream is initialized to gunzipBodyPartiallyEnd.
- Added a regression test tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect
PMO 279420
Task-number: QTBUG-22660
Signed-off-by: Sami Rosendahl <sami.rosendahl@reaktor.fi>
Merge-request: 1465
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/access/qhttpnetworkreply.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp index 129e2c6..b926afe 100644 --- a/src/network/access/qhttpnetworkreply.cpp +++ b/src/network/access/qhttpnetworkreply.cpp @@ -442,8 +442,10 @@ int QHttpNetworkReplyPrivate::gunzipBodyPartially(QByteArray &compressed, QByteA void QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd() { - inflateEnd(&inflateStrm); - initInflate = false; + if (initInflate) { + inflateEnd(&inflateStrm); + initInflate = false; + } } #endif |