summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2010-04-06 13:05:01 (GMT)
committermread <qt-info@nokia.com>2010-04-07 08:29:10 (GMT)
commit71df6edab122730c38ac238e168a4cc35b6f4857 (patch)
tree4fa146bf9ce4f6edcb5db256cae10dc7f01aed25 /src/gui/image
parent440b48c8601e8a4bb31858c8c5521a0ab8961ef8 (diff)
downloadQt-71df6edab122730c38ac238e168a4cc35b6f4857.zip
Qt-71df6edab122730c38ac238e168a4cc35b6f4857.tar.gz
Qt-71df6edab122730c38ac238e168a4cc35b6f4857.tar.bz2
QTBUG-4887 and other exception safety fixes
This change includes a fix for QTBUG-4887 and other exception safety problems found while testing it. The QTBUG-4887 fix is to qimage.cpp. QImage doesn't throw exceptions on failure like a proper class should, instead it tries to fail "nice". What happens here is that setAlphaChannel would crash on OOM as after the convertToFormat call, d could be NULL. This new version checks the result of the conversion before using it. The other fixes are all cases where exceptions were thrown from destructors. I added code to the test app to help debug these cases, and I fixed all the problems I found. With these changes, tst_exceptionsafety_objects runs and passes on the Symbian emulator. Reviewed-by: Shane Kearns
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qimage.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 4f5efa1..5d2b4c0 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -5667,7 +5667,11 @@ void QImage::setAlphaChannel(const QImage &alphaChannel)
detach();
- *this = convertToFormat(QImage::Format_ARGB32_Premultiplied);
+ QImage converted = convertToFormat(QImage::Format_ARGB32_Premultiplied);
+ if (!converted.isNull())
+ *this = converted;
+ else
+ return;
// Slight optimization since alphachannels are returned as 8-bit grays.
if (alphaChannel.d->depth == 8 && alphaChannel.isGrayscale()) {