qtbase: add upstream QTBUG-32534 patch for QHttpMultiPart corruption
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
0f7b233426
commit
886e8ee5bd
|
@ -0,0 +1,41 @@
|
|||
From af96c6fed931564c95037539f07e9c8e33c69529 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hartmann <phartmann@blackberry.com>
|
||||
Date: Thu, 25 Jul 2013 12:05:29 -0400
|
||||
Subject: [PATCH] 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.
|
||||
|
||||
Upstream-Status: Backport [https://codereview.qt-project.org/#change,61698]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Task-number: QTBUG-32534
|
||||
Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
|
||||
Reviewed-by: Jonathan Liu <net147@gmail.com>
|
||||
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
||||
---
|
||||
src/network/access/qhttpmultipart.cpp | 3 +-
|
||||
.../access/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++
|
||||
2 files changed, 46 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp
|
||||
index 4397ef8..5985ed9 100644
|
||||
--- a/src/network/access/qhttpmultipart.cpp
|
||||
+++ b/src/network/access/qhttpmultipart.cpp
|
||||
@@ -497,7 +497,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
|
||||
--
|
||||
1.8.3.4
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From af96c6fed931564c95037539f07e9c8e33c69529 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hartmann <phartmann@blackberry.com>
|
||||
Date: Thu, 25 Jul 2013 12:05:29 -0400
|
||||
Subject: [PATCH] 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.
|
||||
|
||||
Upstream-Status: Accepted [https://codereview.qt-project.org/#change,61698]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Task-number: QTBUG-32534
|
||||
Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
|
||||
Reviewed-by: Jonathan Liu <net147@gmail.com>
|
||||
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
||||
---
|
||||
src/network/access/qhttpmultipart.cpp | 3 +-
|
||||
.../access/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++
|
||||
2 files changed, 46 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp
|
||||
index 4397ef8..5985ed9 100644
|
||||
--- a/src/network/access/qhttpmultipart.cpp
|
||||
+++ b/src/network/access/qhttpmultipart.cpp
|
||||
@@ -497,7 +497,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
|
||||
--
|
||||
1.8.3.4
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From af96c6fed931564c95037539f07e9c8e33c69529 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hartmann <phartmann@blackberry.com>
|
||||
Date: Thu, 25 Jul 2013 12:05:29 -0400
|
||||
Subject: [PATCH] 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.
|
||||
|
||||
Upstream-Status: Accepted [https://codereview.qt-project.org/#change,61698]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Task-number: QTBUG-32534
|
||||
Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
|
||||
Reviewed-by: Jonathan Liu <net147@gmail.com>
|
||||
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
||||
---
|
||||
src/network/access/qhttpmultipart.cpp | 3 +-
|
||||
.../access/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++
|
||||
2 files changed, 46 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp
|
||||
index 4397ef8..5985ed9 100644
|
||||
--- a/src/network/access/qhttpmultipart.cpp
|
||||
+++ b/src/network/access/qhttpmultipart.cpp
|
||||
@@ -497,7 +497,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
|
||||
--
|
||||
1.8.3.4
|
||||
|
|
@ -22,6 +22,7 @@ SRC_URI += " \
|
|||
file://0022-configure-make-alsa-a-configurable-option.patch \
|
||||
file://0023-configure-make-freetype-a-configurable-option.patch \
|
||||
file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
|
||||
file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase-native"
|
||||
|
|
Loading…
Reference in New Issue