Move back the patch for CVE-2014-0190 to qt5-gui.

It applies to -imageformats in Qt4, but -gui in Qt5. Noted by antoine@. A
PORTREVISION bump was unavoidable to make sure people who build
qt5-gui-5.2.1_3 without the patch rebuild the port with it.

MFH:		2014Q3
Security:	904d78b8-0f7e-11e4-8b71-5453ed2e2b49

1 files changed, 0 insertions, 36 deletions

diff --git a/graphics/qt5-imageformats/files/patch-CVE-2014-0190 b/graphics/qt5-imageformats/files/patch-CVE-2014-0190
deleted file mode 100644
index cfbbe0f755c4..000000000000
--- a/graphics/qt5-imageformats/files/patch-CVE-2014-0190
+++ /dev/null
@@ -1,36 +0,0 @@
-commit eb1325047f2697d24e93ebaf924900affc876bc1
-Author: Lars Knoll <lars.knoll@digia.com>
-Date:   Thu Apr 24 15:33:27 2014 +0200
-
-    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.
-    
-    Task-number: QTBUG-38367
-    Change-Id: Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e
-    Security-advisory: CVE-2014-0190
-    Reviewed-by: Richard J. Moore <rich@kde.org>
-
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index eeb62af..19b8382 100644
---- src/gui/image/qgifhandler.cpp
-+++ 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;
-