Fix maybe uninitialized warnings in QgsLayerTreeRegistryBridge::layer…

…sAdded And make memory ownership of values clearer
qgis · Feb 14, 2025 · d5db8a7 · d5db8a7
1 parent cc96192
commit d5db8a7
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/core/layertree/qgslayertreeregistrybridge.cpp b/src/core/layertree/qgslayertreeregistrybridge.cpp
@@ -60,10 +60,10 @@ void QgsLayerTreeRegistryBridge::layersAdded( const QList<QgsMapLayer *> &layers
   if ( !mEnabled )
     return;
 
-  QList<QgsLayerTreeNode *> nodes;
+  QList<QgsLayerTreeNode *> newNodes;
   for ( QgsMapLayer *layer : layers )
   {
-    QgsLayerTreeLayer *nodeLayer;
+    QgsLayerTreeLayer *nodeLayer = nullptr;
     switch ( mInsertionMethod )
     {
       case Qgis::LayerTreeInsertionMethod::OptimalInInsertionGroup:
@@ -72,6 +72,7 @@ void QgsLayerTreeRegistryBridge::layersAdded( const QList<QgsMapLayer *> &layers
         if ( !targetGroup )
           targetGroup = mRoot;
 
+        // returned layer is already owned by the group!
         nodeLayer = QgsLayerTreeUtils::insertLayerAtOptimalPlacement( targetGroup, layer );
         break;
       }
@@ -80,13 +81,15 @@ void QgsLayerTreeRegistryBridge::layersAdded( const QList<QgsMapLayer *> &layers
       case Qgis::LayerTreeInsertionMethod::TopOfTree:
       {
         nodeLayer = new QgsLayerTreeLayer( layer );
+        newNodes << nodeLayer;
         break;
       }
     }
 
-    nodeLayer->setItemVisibilityChecked( mNewLayersVisible );
+    if ( !nodeLayer )
+      continue;
 
-    nodes << nodeLayer;
+    nodeLayer->setItemVisibilityChecked( mNewLayersVisible );
 
     // check whether the layer is marked as embedded
     const QString projectFile = mProject->layerIsEmbedded( nodeLayer->layerId() );
@@ -102,13 +105,13 @@ void QgsLayerTreeRegistryBridge::layersAdded( const QList<QgsMapLayer *> &layers
     case Qgis::LayerTreeInsertionMethod::AboveInsertionPoint:
       if ( QgsLayerTreeGroup *group = mInsertionPointGroup )
       {
-        group->insertChildNodes( mInsertionPointPosition, nodes );
+        group->insertChildNodes( mInsertionPointPosition, newNodes );
         break;
       }
       // if no group for the insertion point, then insert into root instead
       [[fallthrough]];
     case Qgis::LayerTreeInsertionMethod::TopOfTree:
-      mRoot->insertChildNodes( 0, nodes );
+      mRoot->insertChildNodes( 0, newNodes );
       break;
     case Qgis::LayerTreeInsertionMethod::OptimalInInsertionGroup:
       break;