Fix for memory leak in getFeatureInfo (bug #2990)

mhugent · mhugent · commit d07315cd18a5 · 2010-09-11T14:13:11.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14219 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -455,13 +455,15 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result )
 
   if ( configureMapRender( outputImage ) != 0 )
   {
+    delete outputImage;
     return 2;
   }
 
   //find out the current scale denominater and set it to the SLD parser
   QgsScaleCalculator scaleCalc(( outputImage->logicalDpiX() + outputImage->logicalDpiY() ) / 2 , mMapRenderer->destinationSrs().mapUnits() );
   QgsRectangle mapExtent = mMapRenderer->extent();
   mConfigParser->setScaleDenominator( scaleCalc.calculate( mapExtent, outputImage->width() ) );
+  delete outputImage; //no longer needed for feature info
 
   //read FEATURE_COUNT
   int featureCount = 1;

Original file line number	Diff line number	Diff line change
`@@ -455,13 +455,15 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result )`
`455`	`455`
`456`	`456`	`if ( configureMapRender( outputImage ) != 0 )`
`457`	`457`	`{`
	`458`	`+ delete outputImage;`
`458`	`459`	`return 2;`
`459`	`460`	`}`
`460`	`461`
`461`	`462`	`//find out the current scale denominater and set it to the SLD parser`
`462`	`463`	`QgsScaleCalculator scaleCalc(( outputImage->logicalDpiX() + outputImage->logicalDpiY() ) / 2 , mMapRenderer->destinationSrs().mapUnits() );`
`463`	`464`	`QgsRectangle mapExtent = mMapRenderer->extent();`
`464`	`465`	`mConfigParser->setScaleDenominator( scaleCalc.calculate( mapExtent, outputImage->width() ) );`
	`466`	`+ delete outputImage; //no longer needed for feature info`
`465`	`467`
`466`	`468`	`//read FEATURE_COUNT`
`467`	`469`	`int featureCount = 1;`