Patchwork qt4: add upstream QTBUG-32534 patch for QHttpMultiPart upload corruption

login
register
mail settings
Submitter Jonathan Liu
Date Aug. 3, 2013, 7:56 a.m.
Message ID <1375516603-9720-1-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/55025/
State Accepted
Commit 10197429ebe131c811a312a33398bbb13999fd5f
Headers show

Comments

Jonathan Liu - Aug. 3, 2013, 7:56 a.m.
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 meta/recipes-qt/qt4/qt4-4.8.5.inc                  |  1 +
 ...art-fix-data-corruption-in-readData-metho.patch | 43 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch
Laszlo Papp - Aug. 3, 2013, 9:11 a.m.
You need this fix right in your third-party project that it cannot wait
until the next upstream bugfix release, or if not you, someone else
requested it on the Yocto bugtracker?


On Sat, Aug 3, 2013 at 8:56 AM, Jonathan Liu <net147@gmail.com> wrote:

> Signed-off-by: Jonathan Liu <net147@gmail.com>
> ---
>  meta/recipes-qt/qt4/qt4-4.8.5.inc                  |  1 +
>  ...art-fix-data-corruption-in-readData-metho.patch | 43
> ++++++++++++++++++++++
>  2 files changed, 44 insertions(+)
>  create mode 100644
> meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch
>
> diff --git a/meta/recipes-qt/qt4/qt4-4.8.5.inc
> b/meta/recipes-qt/qt4/qt4-4.8.5.inc
> index d05b174..95a14f3 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 0000000..c3c002e
> --- /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
> +
> --
> 1.8.3.4
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
Jonathan Liu - Aug. 3, 2013, 9:22 a.m.
On 3/08/2013 7:11 PM, Laszlo Papp wrote:
> You need this fix right in your third-party project that it cannot 
> wait until the next upstream bugfix release, or if not you, someone 
> else requested it on the Yocto bugtracker?
The corruption is a P1 issue and there are currently no plans for Qt 
4.8.6 yet so it is uncertain when it will be released. There were more 
than 7 months between the Qt 4.8.4 and Qt 4.8.5 releases.

The issue affects one of my projects.

Regards,
Jonathan
Laszlo Papp - Aug. 3, 2013, 9:41 a.m.
OK, thanks.

We need to be careful not to maintain all the 100-200+ patches they may
have as it makes the update a bit more difficult potentially.

I think in this special case, if you already affected, it is worth
approving.


On Sat, Aug 3, 2013 at 10:22 AM, Jonathan Liu <net147@gmail.com> wrote:

> On 3/08/2013 7:11 PM, Laszlo Papp wrote:
>
>> You need this fix right in your third-party project that it cannot wait
>> until the next upstream bugfix release, or if not you, someone else
>> requested it on the Yocto bugtracker?
>>
> The corruption is a P1 issue and there are currently no plans for Qt 4.8.6
> yet so it is uncertain when it will be released. There were more than 7
> months between the Qt 4.8.4 and Qt 4.8.5 releases.
>
> The issue affects one of my projects.
>
> Regards,
> Jonathan
>
Laszlo Papp - Aug. 8, 2013, 4:31 p.m.
Btw, is it a common enough fix to be included, or otherwise you could just
do your .bbappend appliance?


On Sat, Aug 3, 2013 at 10:41 AM, Laszlo Papp <lpapp@kde.org> wrote:

> OK, thanks.
>
> We need to be careful not to maintain all the 100-200+ patches they may
> have as it makes the update a bit more difficult potentially.
>
> I think in this special case, if you already affected, it is worth
> approving.
>
>
> On Sat, Aug 3, 2013 at 10:22 AM, Jonathan Liu <net147@gmail.com> wrote:
>
>> On 3/08/2013 7:11 PM, Laszlo Papp wrote:
>>
>>> You need this fix right in your third-party project that it cannot wait
>>> until the next upstream bugfix release, or if not you, someone else
>>> requested it on the Yocto bugtracker?
>>>
>> The corruption is a P1 issue and there are currently no plans for Qt
>> 4.8.6 yet so it is uncertain when it will be released. There were more than
>> 7 months between the Qt 4.8.4 and Qt 4.8.5 releases.
>>
>> The issue affects one of my projects.
>>
>> Regards,
>> Jonathan
>>
>
>

Patch

diff --git a/meta/recipes-qt/qt4/qt4-4.8.5.inc b/meta/recipes-qt/qt4/qt4-4.8.5.inc
index d05b174..95a14f3 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 0000000..c3c002e
--- /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
+