Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | From f1b76c126c476c155af8c404b97c42cd1a709333 Mon Sep 17 00:00:00 2001 |
| 2 | From: Lars Knoll <lars.knoll@digia.com> |
| 3 | Date: Thu, 24 Apr 2014 15:33:27 +0200 |
| 4 | Subject: [PATCH] Don't crash on broken GIF images |
| 5 | |
| 6 | Broken GIF images could set invalid width and height |
| 7 | values inside the image, leading to Qt creating a null |
| 8 | QImage for it. In that case we need to abort decoding |
| 9 | the image and return an error. |
| 10 | |
| 11 | Initial patch by Rich Moore. |
| 12 | |
| 13 | Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 |
| 14 | |
| 15 | Task-number: QTBUG-38367 |
| 16 | Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a |
| 17 | Security-advisory: CVE-2014-0190 |
| 18 | Reviewed-by: Richard J. Moore <rich@kde.org> |
| 19 | |
| 20 | Upstream-Status: Backport |
| 21 | Signed-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 | |
| 27 | diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp |
| 28 | index 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 | -- |
| 46 | 1.9.3 |
| 47 | |