summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-08-03 17:56:43 +1000
committerSaul Wold <sgw@linux.intel.com>2013-08-05 23:59:57 -0700
commit59c02272fe77589e265da6fc3fa3db0c76bcdf52 (patch)
tree21eb75d149db5c31a827520076c723afe42a3f88 /meta/recipes-qt
parent8e1d380ad30161c358aef22fb8ad7b1d35afa520 (diff)
downloadopenembedded-core-59c02272fe77589e265da6fc3fa3db0c76bcdf52.tar.gz
openembedded-core-59c02272fe77589e265da6fc3fa3db0c76bcdf52.tar.bz2
openembedded-core-59c02272fe77589e265da6fc3fa3db0c76bcdf52.zip
qt4: add upstream QTBUG-32534 patch for QHttpMultiPart upload corruption
Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5.inc1
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch43
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5.inc b/meta/recipes-qt/qt4/qt4-4.8.5.inc
index d05b17464e..95a14f3ddd 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.5.inc
@@ -22,6 +22,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \
file://0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch \
+ file://0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \
file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
file://g++.conf \
file://linux.conf \
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch
new file mode 100644
index 0000000000..c3c002e8a1
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch
@@ -0,0 +1,43 @@
+From 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf 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,61861]
+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>
+(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529)
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/network/access/qhttpmultipart.cpp | 3 +-
+ tests/auto/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 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
+--
+1.8.3.4
+