[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+git155-g716fbae+dfsg-1-6-g378cb1c
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Fri May 1 00:05:01 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=378cb1c
The following commit has been merged in the master branch:
commit 378cb1cdc9b4a4ec3e79ba97cb066ff3726aa89c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Thu Apr 30 21:04:26 2015 -0300
Note that the upload to experimental already fixed some CVEs.
---
debian/changelog | 7 +--
.../fixes_crash_in_bmp_and_ico_image_decoder.patch | 63 ----------------------
.../patches/fixes_crash_in_gif_image_decoder.patch | 31 -----------
debian/patches/series | 2 -
4 files changed, 1 insertion(+), 102 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 831b447..340ae7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,7 @@
qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-2) UNRELEASED; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
- * Add:
- - fixes_crash_in_gif_image_decoder.patch to fix CVE-2015-1860 (gif image
- decoder vulnerability).
- - fixes_crash_in_bmp_and_ico_image_decoder.patch to fix CVE-2015-1858
- and CVE-2015-1859 (bmp and ico image decoders vulnerabilities).
- Both together (Closes: #783133).
+ * The previous upload fixed CVE-2015-1858, CVE-2015-1859, CVE-2015-1860.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 30 Apr 2015 20:42:00 -0300
diff --git a/debian/patches/fixes_crash_in_bmp_and_ico_image_decoder.patch b/debian/patches/fixes_crash_in_bmp_and_ico_image_decoder.patch
deleted file mode 100644
index cd7dc59..0000000
--- a/debian/patches/fixes_crash_in_bmp_and_ico_image_decoder.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3e55cd6dc467303a3c35312e9fcb255c2c048b32 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
-(cherry picked from qtbase/2adbbae5432aa9d8cc41c6fcf55c2e310d2d4078)
-Reviewed-by: Richard J. Moore <rich at kde.org>
----
- 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 30fa9e0..17a880b 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -478,12 +478,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);
-@@ -491,6 +485,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 1a88605..3c34765 100644
---- a/src/plugins/imageformats/ico/qicohandler.cpp
-+++ b/src/plugins/imageformats/ico/qicohandler.cpp
-@@ -571,7 +571,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/fixes_crash_in_gif_image_decoder.patch b/debian/patches/fixes_crash_in_gif_image_decoder.patch
deleted file mode 100644
index 9f1efea..0000000
--- a/debian/patches/fixes_crash_in_gif_image_decoder.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a1cf194c54be57d6ab55dfd26b9562a60532208e 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
-(cherry picked from qtbase/ea2c5417fcd374302f5019e67f72af5facbd29f6)
-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 5199dd3..49aa2a6 100644
---- a/src/gui/image/qgifhandler.cpp
-+++ b/src/gui/image/qgifhandler.cpp
-@@ -944,6 +944,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 da5a05b..6e316ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,8 +3,6 @@ Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
dont_crash_on_broken_gif_images.patch
xmlpatterns_stack_overflow_fix.diff
-fixes_crash_in_bmp_and_ico_image_decoder.patch
-fixes_crash_in_gif_image_decoder.patch
# Patches submitted upstream but still not accepted
aarch64_arm64_qatomic_support.patch
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list