Fix some memory leaks identified by Coverity

qgis · Jan 27, 2017 · 799b833 · 799b833
1 parent 7b14373
commit 799b833
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/core/geometry/qgsinternalgeometryengine.cpp b/src/core/geometry/qgsinternalgeometryengine.cpp
@@ -58,7 +58,7 @@ QgsGeometry QgsInternalGeometryEngine::extrude( double x, double y ) const
     linesToProcess << static_cast<QgsLineString*>( curve->segmentize() );
   }
 
-  QgsMultiPolygonV2 *multipolygon = linesToProcess.size() > 1 ? new QgsMultiPolygonV2() : nullptr;
+  QScopedPointer<QgsMultiPolygonV2> multipolygon( linesToProcess.size() > 1 ? new QgsMultiPolygonV2() : nullptr );
   QgsPolygonV2 *polygon = nullptr;
 
   if ( !linesToProcess.empty() )
@@ -83,7 +83,7 @@ QgsGeometry QgsInternalGeometryEngine::extrude( double x, double y ) const
     }
 
     if ( multipolygon )
-      return QgsGeometry( multipolygon );
+      return QgsGeometry( multipolygon.take() );
     else
       return QgsGeometry( polygon );
   }

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -954,7 +954,7 @@ void QgsRasterLayer::setContrastEnhancement( QgsContrastEnhancement::ContrastEnh
     if ( myBand != -1 )
     {
       Qgis::DataType myType = static_cast< Qgis::DataType >( mDataProvider->dataType( myBand ) );
-      QgsContrastEnhancement* myEnhancement = new QgsContrastEnhancement( static_cast< Qgis::DataType >( myType ) );
+      QScopedPointer<QgsContrastEnhancement> myEnhancement( new QgsContrastEnhancement( static_cast< Qgis::DataType >( myType ) ) );
       myEnhancement->setContrastEnhancementAlgorithm( theAlgorithm, theGenerateLookupTableFlag );
 
       double min;
@@ -978,7 +978,7 @@ void QgsRasterLayer::setContrastEnhancement( QgsContrastEnhancement::ContrastEnh
       {
         myEnhancement->setMinimumValue( min );
         myEnhancement->setMaximumValue( max );
-        myEnhancements.append( myEnhancement );
+        myEnhancements.append( myEnhancement.take() );
       }
     }
     else

diff --git a/src/server/services/wfs/qgswfsgetfeature.cpp b/src/server/services/wfs/qgswfsgetfeature.cpp
@@ -913,6 +913,8 @@ namespace QgsWfs
     {
       QString fcString;
 
+      QScopedPointer< QgsRectangle > transformedRect;
+
       if ( format == QLatin1String( "GeoJSON" ) )
       {
         response.setHeader( "Content-Type", "application/json; charset=utf-8" );
@@ -926,7 +928,10 @@ namespace QgsWfs
           try
           {
             if ( exportGeom.transform( transform ) == 0 )
-              rect = new QgsRectangle( exportGeom.boundingBox() );
+            {
+              transformedRect.reset( new QgsRectangle( exportGeom.boundingBox() ) );
+              rect = transformedRect.data();
+            }
           }
           catch ( QgsException &cse )
           {