From: Morten Johan Sorvig <morten.sorvig@nokia.com>
Date: Thu, 5 Jan 2012 09:14:52 +0000 (+0100)
Subject: Fix crash on null Qimage in QSGPainterNode::paint
X-Git-Tag: upstream/5.2.1~2969
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c582499370743d4c6d23baa1c839193e531d8a45;p=platform%2Fupstream%2Fqtdeclarative.git

Fix crash on null Qimage in QSGPainterNode::paint

Creating a QPainter on a null image is not allowed,
return early if this is the case.

Change-Id: I56f30c0fd84eefc1676d6b980f77269abace07ce
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---

diff --git a/src/quick/scenegraph/util/qsgpainternode.cpp b/src/quick/scenegraph/util/qsgpainternode.cpp
index 640aab9..2ce42fc 100644
--- a/src/quick/scenegraph/util/qsgpainternode.cpp
+++ b/src/quick/scenegraph/util/qsgpainternode.cpp
@@ -154,6 +154,9 @@ void QSGPainterNode::paint()
 {
     QRect dirtyRect = m_dirtyRect.isNull() ? QRect(0, 0, m_size.width(), m_size.height()) : m_dirtyRect;
 
+    if (m_image.isNull())
+        return;
+
     QPainter painter;
     if (m_actualRenderTarget == QQuickPaintedItem::Image)
         painter.begin(&m_image);