diff options
| author | Peter Hartmann <phartmann@blackberry.com> | 2013-07-25 16:05:29 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-03 01:41:37 (GMT) |
| commit | 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf (patch) | |
| tree | 7e689089ac242ce9d2dee649573f627a1ca95acb /src/network/access | |
| parent | 8234f5171a20628d6384d10a45d0437a0ab791ee (diff) | |
| download | Qt-1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf.zip Qt-1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf.tar.gz Qt-1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf.tar.bz2 | |
QHttpMultiPart: fix data corruption in readData method
When readData() is called repeatedly, we need to keep track which
part of the multipart message we are currently reading from.
Hereby we also need to take the boundary size into account, and not
only the size of the multipart; otherwise we would skip a not
completely read part. This would then later lead to advancing the
read pointer by negative indexes and data loss.
Task-number: QTBUG-32534
Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qhttpmultipart.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp index 635129a..b25e917 100644 --- a/src/network/access/qhttpmultipart.cpp +++ b/src/network/access/qhttpmultipart.cpp @@ -488,7 +488,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize) // skip the parts we have already read while (index < multiPart->parts.count() && - readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()) + readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size() + + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart index++; // read the data |