diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-07-19 20:26:10 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-07-19 20:26:10 +0000 |
| commit | 1f7efa274ade3402b7851522e70ab5228cc6c439 (patch) | |
| tree | ca8573e6702a90e1b677e029c0679dd4460e8d22 /x11-toolkits/qt4-gui | |
| parent | 9ee8152a5d5dd54845569151f10e23c275c241db (diff) | |
| download | ports-1f7efa274ade3402b7851522e70ab5228cc6c439.tar.gz ports-1f7efa274ade3402b7851522e70ab5228cc6c439.zip | |
Notes
Diffstat (limited to 'x11-toolkits/qt4-gui')
| -rw-r--r-- | x11-toolkits/qt4-gui/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt4-gui/files/patch-CVE-2014-0190 | 38 |
2 files changed, 39 insertions, 1 deletions
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 2879935f6d22..175b7c331b17 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -3,7 +3,7 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- diff --git a/x11-toolkits/qt4-gui/files/patch-CVE-2014-0190 b/x11-toolkits/qt4-gui/files/patch-CVE-2014-0190 new file mode 100644 index 000000000000..46e2e0e104c2 --- /dev/null +++ b/x11-toolkits/qt4-gui/files/patch-CVE-2014-0190 @@ -0,0 +1,38 @@ +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; + |