[mapserver-commits] r11565 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-04-13 12:35:38 -0700 (Wed, 13 Apr 2011)
New Revision: 11565

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapgraticule.c
Log:
Fix memory leaks in mapgraticule.c (#3831)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-13 17:55:20 UTC (rev 11564)
+++ trunk/mapserver/HISTORY.TXT	2011-04-13 19:35:38 UTC (rev 11565)
@@ -15,6 +15,10 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- fix memory leaks in mapgraticule.c (#3831)
+
+- fix runtime sub validation against web metadata, was using wrong lookup key
+
 - clean up the symbolset if we've used an alternate renderer for a layer (#3834,#3616)
 
 - fix crash on embeded legend with cairo raster renderer

Modified: trunk/mapserver/mapgraticule.c
===================================================================
--- trunk/mapserver/mapgraticule.c	2011-04-13 17:55:20 UTC (rev 11564)
+++ trunk/mapserver/mapgraticule.c	2011-04-13 19:35:38 UTC (rev 11565)
@@ -143,6 +143,9 @@
     pInfo->pboundinglines = NULL;
   }
 
+  free(layer->layerinfo);
+  layer->layerinfo=NULL;
+
   return MS_SUCCESS;
 }
 
@@ -477,8 +480,11 @@
       pInfo->bvertical   = 0;
   }
 
-  if (pInfo->dwhichlatitude >  pInfo->dendlatitude)
+  if (pInfo->dwhichlatitude >  pInfo->dendlatitude) {
+    /* free the lineObj and pointObj that have been erroneously allocated beforehand */
+    msFreeShape(shape);
     return MS_DONE;
+  }
 
   return MS_SUCCESS;
 }