[QGIS Commit] r14219 - trunk/qgis/src/mapserver

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-09-11 14:13:11 +0000 (Sat, 11 Sep 2010)
New Revision: 14219

Modified:
   trunk/qgis/src/mapserver/qgswmsserver.cpp
Log:
Fix for memory leak in getFeatureInfo (bug #2990)

Modified: trunk/qgis/src/mapserver/qgswmsserver.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgswmsserver.cpp	2010-09-10 14:41:55 UTC (rev 14218)
+++ trunk/qgis/src/mapserver/qgswmsserver.cpp	2010-09-11 14:13:11 UTC (rev 14219)
@@ -455,6 +455,7 @@
 
   if ( configureMapRender( outputImage ) != 0 )
   {
+    delete outputImage;
     return 2;
   }
 
@@ -462,6 +463,7 @@
   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;