summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-03-09 22:33:13 +0100
committerSlávek Banko <slavek.banko@axis.cz>2015-03-09 22:34:20 +0100
commitad74a11abf9d62389a6bd74a6edf9cd73e36c8f7 (patch)
tree99926ed748859655be97f9ad1b3c89669f202830
parent73584365f8600414fc5a114ec2f2d6750a7f77cc (diff)
downloadqt3-ad74a11abf9d62389a6bd74a6edf9cd73e36c8f7.tar.gz
qt3-ad74a11abf9d62389a6bd74a6edf9cd73e36c8f7.zip
Fix security issue CVE-2014-0190
[taken from RedHat Qt3 patches]
-rw-r--r--src/kernel/qasyncimageio.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp
index 8ecd1eb..e16125b 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/qasyncimageio.cpp
@@ -904,7 +904,12 @@ int QGIFFormat::decode(QImage& img, QImageConsumer* consumer,
sheight = newtop + newheight;
if (img.isNull()) {
- img.create(swidth, sheight, 32);
+ if (!img.create(swidth, sheight, 32)) {
+ // Check if the attempt to create the image failed. If
+ // it did, the image is broken and we should give up.
+ state = Error;
+ return -1;
+ }
memset( img.bits(), 0, img.numBytes() );
if (consumer) consumer->setSize(swidth, sheight);
}