Fix memory leaks in geometry expression functions

qgis · Aug 10, 2015 · cd7592d · cd7592d
1 parent 1a91ae8
commit cd7592d
Showing 1 changed file with 30 additions and 38 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -1124,20 +1124,17 @@ static QVariant fcnGeomFromWKT( const QVariantList& values, const QgsFeature*, Q
 {
   QString wkt = getStringValue( values.at( 0 ), parent );
   QgsGeometry* geom = QgsGeometry::fromWkt( wkt );
-  if ( geom )
+  QVariant result = geom ? QVariant::fromValue( *geom ) : QVariant();
-    return QVariant::fromValue( *geom );
+  delete geom;
-  else
+  return result;
-    return QVariant();
 }
 static QVariant fcnGeomFromGML( const QVariantList& values, const QgsFeature*, QgsExpression* parent )
 {
   QString gml = getStringValue( values.at( 0 ), parent );
   QgsGeometry* geom = QgsOgcUtils::geometryFromGML( gml );
-
+  QVariant result = geom ? QVariant::fromValue( *geom ) : QVariant();
-  if ( geom )
+  delete geom;
-    return QVariant::fromValue( *geom );
+  return result;
-  else
-    return QVariant();
 }
 
 static QVariant fcnGeomArea( const QVariantList&, const QgsFeature* f, QgsExpression* parent )
@@ -1163,14 +1160,9 @@ static QVariant fcnBounds( const QVariantList& values, const QgsFeature*, QgsExp
 {
   QgsGeometry geom = getGeometry( values.at( 0 ), parent );
   QgsGeometry* geomBounds = QgsGeometry::fromRect( geom.boundingBox() );
-  if ( geomBounds )
+  QVariant result = geomBounds ? QVariant::fromValue( *geomBounds ) : QVariant();
-  {
+  delete geomBounds;
-    return QVariant::fromValue( *geomBounds );
+  return result;
-  }
-  else
-  {
-    return QVariant();
-  }
 }
 
 static QVariant fcnBoundsWidth( const QVariantList& values, const QgsFeature*, QgsExpression* parent )
@@ -1269,34 +1261,34 @@ static QVariant fcnBuffer( const QVariantList& values, const QgsFeature*, QgsExp
     seg = getIntValue( values.at( 2 ), parent );
 
   QgsGeometry* geom = fGeom.buffer( dist, seg );
-  if ( geom )
+  QVariant result = geom ? QVariant::fromValue( *geom ) : QVariant();
-    return QVariant::fromValue( *geom );
+  delete geom;
-  return QVariant();
+  return result;
 }
 static QVariant fcnCentroid( const QVariantList& values, const QgsFeature*, QgsExpression* parent )
 {
   QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
   QgsGeometry* geom = fGeom.centroid();
-  if ( geom )
+  QVariant result = geom ? QVariant::fromValue( *geom ) : QVariant();
-    return QVariant::fromValue( *geom );
+  delete geom;
-  return QVariant();
+  return result;
 }
 static QVariant fcnConvexHull( const QVariantList& values, const QgsFeature*, QgsExpression* parent )
 {
   QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
   QgsGeometry* geom = fGeom.convexHull();
-  if ( geom )
+  QVariant result = geom ? QVariant::fromValue( *geom ) : QVariant();
-    return QVariant::fromValue( *geom );
+  delete geom;
-  return QVariant();
+  return result;
 }
 static QVariant fcnDifference( const QVariantList& values, const QgsFeature*, QgsExpression* parent )
 {
   QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
   QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
   QgsGeometry* geom = fGeom.difference( &sGeom );
-  if ( geom )
+  QVariant result = geom ? QVariant::fromValue( *geom ) : QVariant();
-    return QVariant::fromValue( *geom );
+  delete geom;
-  return QVariant();
+  return result;
 }
 static QVariant fcnDistance( const QVariantList& values, const QgsFeature*, QgsExpression* parent )
 {
@@ -1309,27 +1301,27 @@ static QVariant fcnIntersection( const QVariantList& values, const QgsFeature*,
   QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
   QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
   QgsGeometry* geom = fGeom.intersection( &sGeom );
-  if ( geom )
+  QVariant result = geom ? QVariant::fromValue( *geom ) : QVariant();
-    return QVariant::fromValue( *geom );
+  delete geom;
-  return QVariant();
+  return result;
 }
 static QVariant fcnSymDifference( const QVariantList& values, const QgsFeature*, QgsExpression* parent )
 {
   QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
   QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
   QgsGeometry* geom = fGeom.symDifference( &sGeom );
-  if ( geom )
+  QVariant result = geom ? QVariant::fromValue( *geom ) : QVariant();
-    return QVariant::fromValue( *geom );
+  delete geom;
-  return QVariant();
+  return result;
 }
 static QVariant fcnCombine( const QVariantList& values, const QgsFeature*, QgsExpression* parent )
 {
   QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
   QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
   QgsGeometry* geom = fGeom.combine( &sGeom );
-  if ( geom )
+  QVariant result = geom ? QVariant::fromValue( *geom ) : QVariant();
-    return QVariant::fromValue( *geom );
+  delete geom;
-  return QVariant();
+  return result;
 }
 static QVariant fcnGeomToWKT( const QVariantList& values, const QgsFeature*, QgsExpression* parent )
 {