PathView: fix crash on path remove

There was no check if new path is a valid object

Task-number: QTBUG-53917
Change-Id: I2fd9534c1d34633243d16eda56a2b07e18dabe16
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>

1 files changed, 14 insertions, 7 deletions

diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index 11881ae0ab..03596f13e9 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -704,16 +704,23 @@ void QQuickPathView::setPath(QQuickPath *path)
         qmlobject_disconnect(d->path, QQuickPath, SIGNAL(changed()),
                              this, QQuickPathView, SLOT(pathUpdated()));
     d->path = path;
-    qmlobject_connect(d->path, QQuickPath, SIGNAL(changed()),
-                      this, QQuickPathView, SLOT(pathUpdated()));
-    if (d->isValid() && isComponentComplete()) {
+
+    if (path) {
+        qmlobject_connect(d->path, QQuickPath, SIGNAL(changed()),
+                          this, QQuickPathView, SLOT(pathUpdated()));
+    }
+
+    if (isComponentComplete()) {
         d->clear();
-        if (d->attType) {
-            d->attType->release();
-            d->attType = nullptr;
+        if (d->isValid()) {
+            if (d->attType) {
+                d->attType->release();
+                d->attType = nullptr;
+            }
+            d->regenerate();
         }
-        d->regenerate();
     }
+
     emit pathChanged();
 }