Fix some memory leaks

nyalldawson · nyalldawson · commit a954c3f2bb75 · 2015-08-25T21:39:33.000+10:00
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -146,6 +146,13 @@ const QgsAbstractGeometryV2* QgsGeometry::geometry() const
 void QgsGeometry::setGeometry( QgsAbstractGeometryV2* geometry )
 {
   detach( false );
+  if ( d->geometry )
+  {
+    delete d->geometry;
+    d->geometry = 0;
+  }
+  removeWkbGeos();
+
   d->geometry = geometry;
 }
 
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -1007,10 +1007,14 @@ class TestQgsExpression: public QObject
       QgsPolygon polygon;
       polygon << polygon_ring;
 
-      QTest::newRow( "geomFromWKT Point" ) << "geom_from_wkt('" + QgsGeometry::fromPoint( point )->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPoint( point ) << false;
-      QTest::newRow( "geomFromWKT Line" ) << "geomFromWKT('" + QgsGeometry::fromPolyline( line )->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPolyline( line ) << false;
-      QTest::newRow( "geomFromWKT Polyline" ) << "geomFromWKT('" + QgsGeometry::fromPolyline( polyline )->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPolyline( polyline ) << false;
-      QTest::newRow( "geomFromWKT Polygon" ) << "geomFromWKT('" + QgsGeometry::fromPolygon( polygon )->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPolygon( polygon ) << false;
+      QScopedPointer<QgsGeometry> sourcePoint( QgsGeometry::fromPoint( point ) );
+      QTest::newRow( "geomFromWKT Point" ) << "geom_from_wkt('" + sourcePoint->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPoint( point ) << false;
+      QScopedPointer<QgsGeometry> sourceLine( QgsGeometry::fromPolyline( line ) );
+      QTest::newRow( "geomFromWKT Line" ) << "geomFromWKT('" + sourceLine->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPolyline( line ) << false;
+      QScopedPointer<QgsGeometry> sourcePolyline( QgsGeometry::fromPolyline( polyline ) );
+      QTest::newRow( "geomFromWKT Polyline" ) << "geomFromWKT('" + sourcePolyline->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPolyline( polyline ) << false;
+      QScopedPointer<QgsGeometry> sourcePolygon( QgsGeometry::fromPolygon( polygon ) );
+      QTest::newRow( "geomFromWKT Polygon" ) << "geomFromWKT('" + sourcePolygon->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPolygon( polygon ) << false;
 
       // GML Point
       QTest::newRow( "GML Point (coordinates)" ) << "geomFromGML('<gml:Point><gml:coordinates>123,456</gml:coordinates></gml:Point>')" << ( void * ) QgsGeometry::fromPoint( point ) << false;
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -211,6 +211,7 @@ void TestQgsGeometry::cleanup()
   delete mpPolygonGeometryA;
   delete mpPolygonGeometryB;
   delete mpPolygonGeometryC;
+  delete mpPolylineGeometryD;
   delete mpPainter;
 }
 
@@ -456,6 +457,8 @@ void TestQgsGeometry::initTestCase()
 
 void TestQgsGeometry::cleanupTestCase()
 {
+
+
   //
   // Runs once after all tests are run
   //

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,13 @@ const QgsAbstractGeometryV2* QgsGeometry::geometry() const`
`146`	`146`	`void QgsGeometry::setGeometry( QgsAbstractGeometryV2* geometry )`
`147`	`147`	`{`
`148`	`148`	`detach( false );`
	`149`	`+ if ( d->geometry )`
	`150`	`+ {`
	`151`	`+ delete d->geometry;`
	`152`	`+ d->geometry = 0;`
	`153`	`+ }`
	`154`	`+ removeWkbGeos();`
	`155`	`+`
`149`	`156`	`d->geometry = geometry;`
`150`	`157`	`}`
`151`	`158`
Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,7 @@ void TestQgsGeometry::cleanup()`
`211`	`211`	`delete mpPolygonGeometryA;`
`212`	`212`	`delete mpPolygonGeometryB;`
`213`	`213`	`delete mpPolygonGeometryC;`
	`214`	`+ delete mpPolylineGeometryD;`
`214`	`215`	`delete mpPainter;`
`215`	`216`	`}`
`216`	`217`
`@@ -456,6 +457,8 @@ void TestQgsGeometry::initTestCase()`
`456`	`457`
`457`	`458`	`void TestQgsGeometry::cleanupTestCase()`
`458`	`459`	`{`
	`460`	`+`
	`461`	`+`
`459`	`462`	`//`
`460`	`463`	`// Runs once after all tests are run`
`461`	`464`	`//`