diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/dont_crash_on_broken_gif_images.patch | 42 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 45 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b25bdca..9e2e312 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ qt4-x11 (4:4.8.6+dfsg-1) UNRELEASED; urgency=medium for the tip. * Refresh patches. * Update symbols files with buildd's logs and current build log. + * Apply upstream's dont_crash_on_broken_gif_images.patch to solve + CVE-2014-0190. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 11 Mar 2014 12:38:06 -0300 diff --git a/debian/patches/dont_crash_on_broken_gif_images.patch b/debian/patches/dont_crash_on_broken_gif_images.patch new file mode 100644 index 0000000..4524a8f --- /dev/null +++ b/debian/patches/dont_crash_on_broken_gif_images.patch @@ -0,0 +1,42 @@ +From 19d31c5b036a46365584d7d97e87f7fe16150623 Mon Sep 17 00:00:00 2001 +From: Lars Knoll <lars.knoll@digia.com> +Date: Thu, 24 Apr 2014 15:33:27 +0200 +Subject: [PATCH] Don't crash on broken GIF images + +Broken GIF images could set invalid width and height +values inside the image, leading to Qt creating a null +QImage for it. In that case we need to abort decoding +the image and return an error. + +Initial patch by Rich Moore. + +Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 + +Task-number: QTBUG-38367 +Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a +Security-advisory: CVE-2014-0190 +--- + src/gui/image/qgifhandler.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp +index 3324f04..5199dd3 100644 +--- a/src/gui/image/qgifhandler.cpp ++++ b/src/gui/image/qgifhandler.cpp +@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, + memset(bits, 0, image->byteCount()); + } + ++ // Check if the previous attempt to create the image failed. If it ++ // did then the image is broken and we should give up. ++ if (image->isNull()) { ++ state = Error; ++ return -1; ++ } ++ + disposePrevious(image); + disposed = false; + +-- +1.8.5.1 + diff --git a/debian/patches/series b/debian/patches/series index 317f9be..8734ce2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ # upstream patches 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 # qt-copy patches 0195-compositing-properties.diff |