Fix memory management of errors

qgis · Oct 15, 2018 · b0d8d8e · b0d8d8e
1 parent 9c6c3aa
commit b0d8d8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/app/qgsgeometryvalidationservice.cpp b/src/app/qgsgeometryvalidationservice.cpp
@@ -270,7 +270,7 @@ void QgsGeometryValidationService::triggerTopologyChecks( QgsVectorLayer *layer
     mFeaturePools.insert( layer->id(), featurePool );
   }
 
-  QList<QgsGeometryCheckError *> &allErrors = mLayerChecks[layer].topologyCheckErrors;
+  QList<std::shared_ptr<QgsGeometryCheckError>> &allErrors = mLayerChecks[layer].topologyCheckErrors;
   QMap<QString, QgsFeatureIds> layerIds;
 
   QgsFeatureRequest request = QgsFeatureRequest( affectedFeatureIds ).setSubsetOfAttributes( QgsAttributeList() );
@@ -306,13 +306,13 @@ void QgsGeometryValidationService::triggerTopologyChecks( QgsVectorLayer *layer
 
     check->collectErrors( mFeaturePools, errors, messages, feedback, layerFeatureIds );
     QgsReadWriteLocker errorLocker( mTopologyCheckLock, QgsReadWriteLocker::Write );
-    allErrors.append( errors );
 
     QList<std::shared_ptr<QgsGeometryCheckError> > sharedErrors;
     for ( QgsGeometryCheckError *error : errors )
     {
       sharedErrors.append( std::shared_ptr<QgsGeometryCheckError>( error ) );
     }
+    allErrors.append(sharedErrors);
     if ( !feedback->isCanceled() )
       emit topologyChecksUpdated( layer, sharedErrors );
 

diff --git a/src/app/qgsgeometryvalidationservice.h b/src/app/qgsgeometryvalidationservice.h
@@ -96,7 +96,7 @@ class QgsGeometryValidationService : public QObject
       QList< QgsGeometryCheck *> topologyChecks;
       QFutureWatcher<void> *topologyCheckFutureWatcher = nullptr;
       QList<QgsFeedback *> topologyCheckFeedbacks; // will be deleted when topologyCheckFutureWatcher is delteed
-      QList<QgsGeometryCheckError *> topologyCheckErrors;
+      QList<std::shared_ptr<QgsGeometryCheckError>> topologyCheckErrors;
       QList<QMetaObject::Connection> connections;
       QgsGeometryCheckContext *context = nullptr;
     };