18 lines
877 B
Diff
18 lines
877 B
Diff
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;
|
|
|