diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch deleted file mode 100644 index 6858cead..00000000 --- a/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From af96c6fed931564c95037539f07e9c8e33c69529 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Hartmann <phartmann@blackberry.com> | ||
3 | Date: Thu, 25 Jul 2013 12:05:29 -0400 | ||
4 | Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method | ||
5 | |||
6 | When readData() is called repeatedly, we need to keep track which | ||
7 | part of the multipart message we are currently reading from. | ||
8 | Hereby we also need to take the boundary size into account, and not | ||
9 | only the size of the multipart; otherwise we would skip a not | ||
10 | completely read part. This would then later lead to advancing the | ||
11 | read pointer by negative indexes and data loss. | ||
12 | |||
13 | Upstream-Status: Accepted [https://codereview.qt-project.org/#change,61698] | ||
14 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
15 | |||
16 | Task-number: QTBUG-32534 | ||
17 | Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 | ||
18 | Reviewed-by: Jonathan Liu <net147@gmail.com> | ||
19 | Reviewed-by: Shane Kearns <shane.kearns@accenture.com> | ||
20 | --- | ||
21 | src/network/access/qhttpmultipart.cpp | 3 +- | ||
22 | .../access/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++ | ||
23 | 2 files changed, 46 insertions(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp | ||
26 | index 4397ef8..5985ed9 100644 | ||
27 | --- a/src/network/access/qhttpmultipart.cpp | ||
28 | +++ b/src/network/access/qhttpmultipart.cpp | ||
29 | @@ -497,7 +497,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize) | ||
30 | |||
31 | // skip the parts we have already read | ||
32 | while (index < multiPart->parts.count() && | ||
33 | - readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()) | ||
34 | + readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size() | ||
35 | + + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart | ||
36 | index++; | ||
37 | |||
38 | // read the data | ||
39 | -- | ||
40 | 1.8.3.4 | ||
41 | |||