diff options
| author | Britney Fransen <brfransen@gmail.com> | 2015-02-19 18:16:16 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2015-02-19 18:16:16 (GMT) |
| commit | 8de064f6e96f960cdbfe6868d9957a4613f704df (patch) | |
| tree | 4e73a420991733450d013529c0fee60e0365297a /abs/core/qt4/CVE-2014-0190.patch | |
| parent | 0374b16f1e15ba1819b62bd5a6e0076ac7b243d0 (diff) | |
| parent | 6fde8cd5e74f0840e01988e743464fe91c0a28f8 (diff) | |
| download | linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.zip linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.tar.gz linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/core/qt4/CVE-2014-0190.patch')
| -rw-r--r-- | abs/core/qt4/CVE-2014-0190.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/abs/core/qt4/CVE-2014-0190.patch b/abs/core/qt4/CVE-2014-0190.patch new file mode 100644 index 0000000..e97ee7b --- /dev/null +++ b/abs/core/qt4/CVE-2014-0190.patch @@ -0,0 +1,32 @@ +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 + +diff -up qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367 qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp +--- qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367 2014-04-10 13:37:12.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp 2014-04-24 15:58:54.515862458 -0500 +@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, co + 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; + |