1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QRasterPlatformPixmap::createPixmapForImage(): Avoid crash when QImage conversion failes

Browse Source 
Added some checks to QRasterPlatformPixmap::createPixmapForImage() to avoid
crashes when QImage::convertToFormat() returns a null image.

Change-Id: I573505a1aff7931d9a2fb452d0a83ae93d8de7db
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Martin Pley 2014-06-10 13:33:26 +02:00 committed by Morten Johan Sørvig
parent 4038f21dd0
commit c92ece4518
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/image/qpixmap_raster.cpp
View File

@ -363,10 +363,12 @@ void QRasterPlatformPixmap::createPixmapForImage(QImage &sourceImage, Qt::ImageC
} }
is_null = (w <= 0 || h <= 0); is_null = (w <= 0 || h <= 0);
image.d->devicePixelRatio = sourceImage.devicePixelRatio(); if (image.d)
image.d->devicePixelRatio = sourceImage.devicePixelRatio();
//ensure the pixmap and the image resulting from toImage() have the same cacheKey(); //ensure the pixmap and the image resulting from toImage() have the same cacheKey();
setSerialNumber(image.cacheKey() >> 32); setSerialNumber(image.cacheKey() >> 32);
setDetachNumber(image.d->detach_no); if (image.d)
setDetachNumber(image.d->detach_no);
} }
QImage* QRasterPlatformPixmap::buffer() QImage* QRasterPlatformPixmap::buffer()