[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=4e3cb19

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

    Remove fixes_crash_in_gif_image_decoder.patch
    
    Applied upstream.
---
 debian/changelog                                   |  1 +
 .../patches/fixes_crash_in_gif_image_decoder.patch | 30 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 868c77b..3e02af7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
     - 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
+    - fixes_crash_in_gif_image_decoder.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_gif_image_decoder.patch b/debian/patches/fixes_crash_in_gif_image_decoder.patch
deleted file mode 100644
index d9871ae..0000000
--- a/debian/patches/fixes_crash_in_gif_image_decoder.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d3048a29797ee2d80d84bbda26bb3c954584f332 Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland at theqtcompany.com>
-Date: Wed, 11 Mar 2015 09:00:41 +0100
-Subject: [PATCH] Fixes crash in gif image decoder
-
-Fuzzing test revealed that for certain malformed gif files,
-qgifhandler would segfault.
-
-Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1
-Reviewed-by: Richard J. Moore <rich at kde.org>
----
- src/gui/image/qgifhandler.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index 03e46ab..8d8c4ae 100644
---- a/src/gui/image/qgifhandler.cpp
-+++ b/src/gui/image/qgifhandler.cpp
-@@ -936,6 +936,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co
- 
- void QGIFFormat::nextY(unsigned char *bits, int bpl)
- {
-+    if (out_of_bounds)
-+        return;
-     int my;
-     switch (interlace) {
-     case 0: // Non-interlaced
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 55073e4..d7c3f4d 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_gif_image_decoder.patch
 tst_QNetworkDiskCache-Stop-using-actual-web-servers.patch
 
 # Debian specific.

-- 
qtbase packaging