Fix security issue CVE-2014-0190

[taken from RedHat Qt3 patches]
(cherry picked from commit ad74a11abf)
v3.5.13-sru
Slávek Banko 10 years ago
parent 635d3fe606
commit 2e1f44ecf6

@ -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);
}

Loading…
Cancel
Save