From 9cbbd38f22fe0aff72599583c7702f88195a7607 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 23 Jan 2012 14:02:48 +0100 Subject: pixmap: Add QPlatformPixmap::fromData null check for the image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QPlatformPixmap::fromFile is doing the null check, QRasterPlatformPixmap::fromData is doing the null check as well. Add the null check to QPlatformPixmap::fromData as well. This would have avoided a crash in the directfb plugin. Change-Id: Ifc904b2df2424e86bf0992d4e28dc256530be02d Reviewed-by: Samuel Rødal --- src/gui/image/qplatformpixmap.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gui/image/qplatformpixmap.cpp') diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp index c34b779797..5162ea80d9 100644 --- a/src/gui/image/qplatformpixmap.cpp +++ b/src/gui/image/qplatformpixmap.cpp @@ -133,6 +133,8 @@ bool QPlatformPixmap::fromData(const uchar *buf, uint len, const char *format, Q QBuffer b(&a); b.open(QIODevice::ReadOnly); QImage image = QImageReader(&b, format).read(); + if (image.isNull()) + return false; fromImage(makeBitmapCompliantIfNeeded(this, image, flags), flags); return !isNull(); } -- cgit v1.2.3