diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-02-20 15:48:40 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-02-24 12:13:56 +0000 |
| commit | 9e59174b49b8d4c6ebe0cab2b8df9e93f1090211 (patch) | |
| tree | cbe694c84ce89efbd2170031642aa0cb28f0336c /src/gui/image | |
| parent | d8e65d5756c937fc3d9be3e5c30b31914a437393 (diff) | |
QPixmap: check data ptr in isQBitmap()
Task-number: QTBUG-51271
Change-Id: I670e074ced1217d2614fa334eb365e40ef80b8b1
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index fb62889e40..0c8ab527b2 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -481,7 +481,7 @@ QMatrix QPixmap::trueMatrix(const QMatrix &m, int w, int h) bool QPixmap::isQBitmap() const { - return data->type == QPlatformPixmap::BitmapType; + return data && data->type == QPlatformPixmap::BitmapType; } /*! |