From 7968bd306d182d244a73682aebdb9e74edbc6304 Mon Sep 17 00:00:00 2001 From: Berthold Krevert Date: Fri, 3 Aug 2012 16:56:53 +0200 Subject: [PATCH] Fixes a crash in QQuickImageParticle Fixes this bug: If the property source is set to an empty string or not set at all, the application crashes due to a missing pointer check. Change-Id: I8c2a2ba738ceda573e655221fde37012f6bf3053 Reviewed-by: Friedemann Kleint Reviewed-by: Alan Alpert --- src/particles/qquickimageparticle.cpp | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index b55589e..128bdf2 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -855,6 +855,7 @@ void QQuickImageParticle::setImage(const QUrl &image) if (image.isEmpty()){ if (m_image) { delete m_image; + m_image = 0; emit imageChanged(); } return; @@ -1431,8 +1432,9 @@ void QQuickImageParticle::finishBuildParticleNodes() if (!m_material) m_material = SimpleMaterial::createMaterial(); if (!imageLoaded) { - if (!m_image->pix.isReady()) { - qmlInfo(this) << m_image->pix.error(); + if (!m_image || !m_image->pix.isReady()) { + if (m_image) + qmlInfo(this) << m_image->pix.error(); delete m_material; return; } -- 1.7.2.5