summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7.inc1
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch47
2 files changed, 0 insertions, 48 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc
index 5257e760e0..10f87a79d5 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc
@@ -21,7 +21,6 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
21 file://0018-configure-make-pulseaudio-a-configurable-option.patch \ 21 file://0018-configure-make-pulseaudio-a-configurable-option.patch \
22 file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ 22 file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
23 file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ 23 file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
24 file://0028-Don-t-crash-on-broken-GIF-images.patch \
25 file://0030-aarch64_arm64_qatomic_support.patch \ 24 file://0030-aarch64_arm64_qatomic_support.patch \
26 file://0031-aarch64_arm64_mkspecs.patch \ 25 file://0031-aarch64_arm64_mkspecs.patch \
27 file://0032-aarch64_add_header.patch \ 26 file://0032-aarch64_add_header.patch \
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch
deleted file mode 100644
index 906e2fdfc8..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From f1b76c126c476c155af8c404b97c42cd1a709333 Mon Sep 17 00:00:00 2001
2From: Lars Knoll <lars.knoll@digia.com>
3Date: Thu, 24 Apr 2014 15:33:27 +0200
4Subject: [PATCH] Don't crash on broken GIF images
5
6Broken GIF images could set invalid width and height
7values inside the image, leading to Qt creating a null
8QImage for it. In that case we need to abort decoding
9the image and return an error.
10
11Initial patch by Rich Moore.
12
13Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
14
15Task-number: QTBUG-38367
16Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
17Security-advisory: CVE-2014-0190
18Reviewed-by: Richard J. Moore <rich@kde.org>
19
20Upstream-Status: Backport
21Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
22
23---
24 src/gui/image/qgifhandler.cpp | 7 +++++++
25 1 file changed, 7 insertions(+)
26
27diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
28index 3324f04..5199dd3 100644
29--- a/src/gui/image/qgifhandler.cpp
30+++ b/src/gui/image/qgifhandler.cpp
31@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
32 memset(bits, 0, image->byteCount());
33 }
34
35+ // Check if the previous attempt to create the image failed. If it
36+ // did then the image is broken and we should give up.
37+ if (image->isNull()) {
38+ state = Error;
39+ return -1;
40+ }
41+
42 disposePrevious(image);
43 disposed = false;
44
45--
461.9.3
47