summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond@trolltech.com>2009-06-10 11:14:45 +0200
committerTrond Kjernåsen <trond@trolltech.com>2009-06-10 11:50:59 +0200
commitd0823a0113253cf52859e84f41db82e96b80331e (patch)
treefd7d6b15c49cb03cb4f370b8b874c21e2c3975cd
parent7886888d3e873500dd1ea7d3f450f7d7f87c0ea6 (diff)
Make sure QImage::mirrored() doesn't crash if it runs out of memory.
Task-number: 255742 Reviewed-by: Kim
-rw-r--r--src/gui/image/qimage.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 70d4e2cec0..338ae77cc4 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -4277,6 +4277,11 @@ QImage QImage::mirrored(bool horizontal, bool vertical) const
int h = d->height;
// Create result image, copy colormap
QImage result(d->width, d->height, d->format);
+
+ // check if we ran out of of memory..
+ if (!result.d)
+ return QImage();
+
result.d->colortable = d->colortable;
result.d->has_alpha_clut = d->has_alpha_clut;