From ca33079e91365479506025431fea93cccf210c68 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 9 Dec 2020 16:01:41 +0100
Subject: [PATCH] QmlDesigner: Add QTC_ASSERT

In corner cases m_nodeInstanceServer can be null.
This should be considered as an error, but there is
no reason to crash in this case.

Change-Id: If2b5e11b7d2462634ab8f9bce653bdbc5b3c8b45
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../designercore/instances/nodeinstanceview.cpp        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index a06fddbc663..3e3c6379b10 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -422,6 +422,7 @@ void NodeInstanceView::resetVerticalAnchors(const ModelNode &modelNode)
 
 void NodeInstanceView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList)
 {
+    QTC_ASSERT(m_nodeInstanceServer, return);
 
     QList<ModelNode> nodeList;
     QList<AbstractProperty> nonNodePropertyList;
@@ -493,6 +494,7 @@ void NodeInstanceView::nodeTypeChanged(const ModelNode &, const TypeName &, int,
 
 void NodeInstanceView::bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags /*propertyChange*/)
 {
+    QTC_ASSERT(m_nodeInstanceServer, return);
     m_nodeInstanceServer->changePropertyBindings(createChangeBindingCommand(propertyList));
 }
 
@@ -507,6 +509,7 @@ void NodeInstanceView::bindingPropertiesChanged(const QList<BindingProperty>& pr
 
 void NodeInstanceView::variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags /*propertyChange*/)
 {
+    QTC_ASSERT(m_nodeInstanceServer, return);
     updatePosition(propertyList);
     m_nodeInstanceServer->changePropertyValues(createChangeValueCommand(propertyList));
 }
@@ -522,6 +525,7 @@ void NodeInstanceView::variantPropertiesChanged(const QList<VariantProperty>& pr
 
 void NodeInstanceView::nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags /*propertyChange*/)
 {
+    QTC_ASSERT(m_nodeInstanceServer, return);
     if (!isSkippedNode(node)) {
         updateChildren(newPropertyParent);
         m_nodeInstanceServer->reparentInstances(
@@ -531,11 +535,14 @@ void NodeInstanceView::nodeReparented(const ModelNode &node, const NodeAbstractP
 
 void NodeInstanceView::fileUrlChanged(const QUrl &/*oldUrl*/, const QUrl &newUrl)
 {
+    QTC_ASSERT(m_nodeInstanceServer, return);
     m_nodeInstanceServer->changeFileUrl(createChangeFileUrlCommand(newUrl));
 }
 
 void NodeInstanceView::nodeIdChanged(const ModelNode& node, const QString& /*newId*/, const QString &oldId)
 {
+    QTC_ASSERT(m_nodeInstanceServer, return);
+
     if (hasInstanceForModelNode(node)) {
         NodeInstance instance = instanceForModelNode(node);
         m_nodeInstanceServer->changeIds(createChangeIdsCommand({instance}));
@@ -546,6 +553,7 @@ void NodeInstanceView::nodeIdChanged(const ModelNode& node, const QString& /*new
 void NodeInstanceView::nodeOrderChanged(const NodeListProperty & listProperty,
                                         const ModelNode & /*movedNode*/, int /*oldIndex*/)
 {
+    QTC_ASSERT(m_nodeInstanceServer, return);
     QVector<ReparentContainer> containerList;
     PropertyName propertyName = listProperty.name();
     qint32 containerInstanceId = -1;
@@ -574,6 +582,7 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node,
                                             const PropertyName &name,
                                             const QVariant &value)
 {
+    QTC_ASSERT(m_nodeInstanceServer, return);
     if (((node.isRootNode() && (name == "width" || name == "height")) || name == "invisible" || name == "locked")
             || name.endsWith(PropertyName("@NodeInstance"))) {
         if (hasInstanceForModelNode(node)) {
@@ -610,6 +619,7 @@ void NodeInstanceView::customNotification(const AbstractView *view, const QStrin
 
 void NodeInstanceView::nodeSourceChanged(const ModelNode &node, const QString & newNodeSource)
 {
+     QTC_ASSERT(m_nodeInstanceServer, return);
      if (hasInstanceForModelNode(node)) {
          NodeInstance instance = instanceForModelNode(node);
          ChangeNodeSourceCommand changeNodeSourceCommand(instance.instanceId(), newNodeSource);