QQuickParticleSystem: Fix crash when an Affector dies

A guarded pointer wasn't checked before being de-referenced, that lead
to a crash if an emitter was modified after an affector was deleted, but
before updateCurrentTime() was called.

Change-Id: I6cb605a711319fb77c1e2e87fa9f35427cd7797b
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp
index 5c82b946e5..5f9db12144 100644
--- a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp
+++ b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp
@@ -42,6 +42,7 @@ public:
 private slots:
     void initTestCase();
     void test_basic();
+    void test_affectorscrash();
 };
 
 void tst_qquickparticlesystem::initTestCase()
@@ -78,6 +79,12 @@ void tst_qquickparticlesystem::test_basic()
     delete view;
     QVERIFY(extremelyFuzzyCompare(stillAlive, 500, 5));//Small simulation variance is permissible.
 }
+void tst_qquickparticlesystem::test_affectorscrash()
+{
+    QScopedPointer<QQuickView> view (createView(testFileUrl("crashaffectors.qml"), 600));
+
+    // This should have crashed by now
+}
 
 QTEST_MAIN(tst_qquickparticlesystem);