summaryrefslogtreecommitdiffstats
path: root/deps/qt/qt.fix.broken.gif.crash.diff
diff options
context:
space:
mode:
Diffstat (limited to 'deps/qt/qt.fix.broken.gif.crash.diff')
-rw-r--r--deps/qt/qt.fix.broken.gif.crash.diff16
1 files changed, 16 insertions, 0 deletions
diff --git a/deps/qt/qt.fix.broken.gif.crash.diff b/deps/qt/qt.fix.broken.gif.crash.diff
new file mode 100644
index 0000000..7f74d71
--- /dev/null
+++ b/deps/qt/qt.fix.broken.gif.crash.diff
@@ -0,0 +1,16 @@
+--- ./src/gui/image/qgifhandler.cpp.orig 2014-04-10 13:37:12.000000000 -0500
++++ ./src/gui/image/qgifhandler.cpp 2014-04-25 13:42:48.468692269 -0500
+@@ -358,6 +358,13 @@
+ bits = image->bits();
+ 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;