[gentoo-commits] gentoo-x86 commit in dev-qt/qtgui/files: qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch

[gentoo-commits] gentoo-x86 commit in dev-qt/qtgui/files: qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch

[Davide Pesavento (pesa)]

pesa        14/05/28 01:12:25

  Added:                qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch
  Log:
  Apply patch for security bug #508984. Add missing deps.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

Revision  Changes    Path
1.1                  dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch?rev=1.1&content-type=text/plain

Index: qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch
===================================================================
From f1b76c126c476c155af8c404b97c42cd1a709333 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Thu, 24 Apr 2014 15:33:27 +0200
Subject: 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
Reviewed-by: Richard J. Moore <rich@kde.org>
---
 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.9.3