[mapserver-commits] r11538 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-04-12 04:22:58 -0700 (Tue, 12 Apr 2011)
New Revision: 11538

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapfile.c
Log:
fix memory leak when freeing GRID layers

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-12 10:20:19 UTC (rev 11537)
+++ trunk/mapserver/HISTORY.TXT	2011-04-12 11:22:58 UTC (rev 11538)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- fix memory leak when freeing GRID layers
+
 - fix segfault with marker symbols on short lines (#3823)
 
 - wms_getmap_formatlist causes first defined outputformat to be returned by getmap (#3826)

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2011-04-12 10:20:19 UTC (rev 11537)
+++ trunk/mapserver/mapfile.c	2011-04-12 11:22:58 UTC (rev 11538)
@@ -3416,6 +3416,10 @@
 
   if(msLayerIsOpen(layer))
      msLayerClose(layer);
+  if( layer->layerinfo &&  layer->connectiontype == MS_GRATICULE) {
+     free(layer->layerinfo);
+     layer->layerinfo = NULL;
+  }
 
   msFree(layer->name);
   msFree(layer->group);