[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-2-40-g4e3cb19

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=46a9d0f

The following commit has been merged in the experimental branch:
commit 46a9d0f8a803ffa95dbcacc1830c974ae37090bc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 25 19:34:50 2015 -0300

    Delete fixes_crash_in_bmp_and_ico_image_decoders.patch
    
    Applied upstream.
---
 debian/changelog                                   |  1 +
 ...fixes_crash_in_bmp_and_ico_image_decoders.patch | 62 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75a9593..868c77b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
     - require_fpic_instead_of_fpie.patch
     - try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
     - make_qglobal_h_complain_if_you_use_fpie.patch
+    - fixes_crash_in_bmp_and_ico_image_decoders.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 May 2015 18:35:01 -0300
 
diff --git a/debian/patches/fixes_crash_in_bmp_and_ico_image_decoders.patch b/debian/patches/fixes_crash_in_bmp_and_ico_image_decoders.patch
deleted file mode 100644
index 9a2fc6e..0000000
--- a/debian/patches/fixes_crash_in_bmp_and_ico_image_decoders.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland at theqtcompany.com>
-Date: Wed, 11 Mar 2015 13:34:01 +0100
-Subject: [PATCH] Fixes crash in bmp and ico image decoding
-
-Fuzzing test revealed that for certain malformed bmp and ico files,
-the handler would segfault.
-
-Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe
-Reviewed-by: Lars Knoll <lars.knoll at digia.com>
----
- src/gui/image/qbmphandler.cpp                | 13 +++++++------
- src/plugins/imageformats/ico/qicohandler.cpp |  2 +-
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index df66499..8acc593 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -484,12 +484,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-                             p = data + (h-y-1)*bpl;
-                             break;
-                         case 2:                        // delta (jump)
--                            // Protection
--                            if ((uint)x >= (uint)w)
--                                x = w-1;
--                            if ((uint)y >= (uint)h)
--                                y = h-1;
--
-                             {
-                                 quint8 tmp;
-                                 d->getChar((char *)&tmp);
-@@ -497,6 +491,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-                                 d->getChar((char *)&tmp);
-                                 y += tmp;
-                             }
-+
-+                            // Protection
-+                            if ((uint)x >= (uint)w)
-+                                x = w-1;
-+                            if ((uint)y >= (uint)h)
-+                                y = h-1;
-+
-                             p = data + (h-y-1)*bpl + x;
-                             break;
-                         default:                // absolute mode
-diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
-index 00de0c8..ec1654e 100644
---- a/src/plugins/imageformats/ico/qicohandler.cpp
-+++ b/src/plugins/imageformats/ico/qicohandler.cpp
-@@ -567,7 +567,7 @@ QImage ICOReader::iconAt(int index)
-                 QImage::Format format = QImage::Format_ARGB32;
-                 if (icoAttrib.nbits == 24)
-                     format = QImage::Format_RGB32;
--                else if (icoAttrib.ncolors == 2)
-+                else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1)
-                     format = QImage::Format_Mono;
-                 else if (icoAttrib.ncolors > 0)
-                     format = QImage::Format_Indexed8;
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 1645bc2..55073e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
 upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
-fixes_crash_in_bmp_and_ico_image_decoders.patch
 fixes_crash_in_gif_image_decoder.patch
 tst_QNetworkDiskCache-Stop-using-actual-web-servers.patch
 

-- 
qtbase packaging