Fix incorrect logic in QgsGeometryDuplicateCheck

qgis · Feb 8, 2021 · e3be840 · e3be840
1 parent 2d9c002
commit e3be840
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp
@@ -71,7 +71,7 @@ void QgsGeometryDuplicateCheck::collectErrors( const QMap<QString, QgsFeaturePoo
       QString errMsg;
       QgsGeometry geomB = layerFeatureB.geometry();
       std::unique_ptr<QgsAbstractGeometry> diffGeom( geomEngineA->symDifference( geomB.constGet(), &errMsg ) );
-      if ( errMsg.isEmpty() && diffGeom && diffGeom->isEmpty() )
+      if ( errMsg.isEmpty() && ( !diffGeom || diffGeom->isEmpty() ) )
       {
         duplicates[layerFeatureB.layer()->id()].append( layerFeatureB.feature().id() );
       }
@@ -121,14 +121,12 @@ void QgsGeometryDuplicateCheck::fixError( const QMap<QString, QgsFeaturePool *>
           continue;
         }
         QgsGeometryCheckerUtils::LayerFeature layerFeatureB( featurePoolB, featureB, mContext, true );
-        QgsAbstractGeometry *diffGeom = geomEngineA->symDifference( layerFeatureB.geometry().constGet() );
-        if ( diffGeom && diffGeom->isEmpty() )
+        std::unique_ptr< QgsAbstractGeometry > diffGeom( geomEngineA->symDifference( layerFeatureB.geometry().constGet() ) );
+        if ( !diffGeom || diffGeom->isEmpty() )
         {
           featurePoolB->deleteFeature( featureB.id() );
           changes[layerIdB][idB].append( Change( ChangeFeature, ChangeRemoved ) );
         }
-
-        delete diffGeom;
       }
     }
     error->setFixed( method );