From dcb98430f6add24c9d54253bd35d35010cc75c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond.kjernasen@nokia.com>
Date: Wed, 1 Sep 2010 12:33:55 +0200
Subject: Fix a crash when passing a null pixmap to
 QPainter::drawPixmapFragments().

Task-number: QTBUG-13331
Reviewed-by: Samuel
---
 src/gui/painting/qpainter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 4e10671..c6046ac 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -9028,7 +9028,7 @@ void QPainter::drawPixmapFragments(const PixmapFragment *fragments, int fragment
 {
     Q_D(QPainter);
 
-    if (!d->engine)
+    if (!d->engine || pixmap.isNull())
         return;
 
 #ifndef QT_NO_DEBUG
-- 
cgit v0.12