diff options
Diffstat (limited to 'x11-toolkits/qt4-gui/files/patch-CVE-2014-0190')
-rw-r--r-- | x11-toolkits/qt4-gui/files/patch-CVE-2014-0190 | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/x11-toolkits/qt4-gui/files/patch-CVE-2014-0190 b/x11-toolkits/qt4-gui/files/patch-CVE-2014-0190 deleted file mode 100644 index 46e2e0e104c2..000000000000 --- a/x11-toolkits/qt4-gui/files/patch-CVE-2014-0190 +++ /dev/null @@ -1,38 +0,0 @@ -commit f1b76c126c476c155af8c404b97c42cd1a709333 -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. - - 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> - -diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp -index 3324f04..5199dd3 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; - |