From c582499370743d4c6d23baa1c839193e531d8a45 Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Thu, 5 Jan 2012 10:14:52 +0100 Subject: 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 --- src/quick/scenegraph/util/qsgpainternode.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/quick/scenegraph/util/qsgpainternode.cpp b/src/quick/scenegraph/util/qsgpainternode.cpp index 640aab967e..2ce42fcc4d 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); -- cgit v1.2.3