[mapserver-commits] r11548 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-04-12 10:59:26 -0700 (Tue, 12 Apr 2011)
New Revision: 11548

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapfile.c
Log:
fix memory leak in msFreeLabelCacheSlot (#3829)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-12 15:20:45 UTC (rev 11547)
+++ trunk/mapserver/HISTORY.TXT	2011-04-12 17:59:26 UTC (rev 11548)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- fix memory leak in msFreeLabelCacheSlot (#3829)
+
 - use a circle brush for wide GD lines (#3835)
 
 - fix segmentation fault with transparent layers containing symbols (#3834)

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2011-04-12 15:20:45 UTC (rev 11547)
+++ trunk/mapserver/mapfile.c	2011-04-12 17:59:26 UTC (rev 11548)
@@ -5127,8 +5127,7 @@
       msFree(cacheslot->labels[i].text);
       if (cacheslot->labels[i].labelpath)
         msFreeLabelPathObj(cacheslot->labels[i].labelpath);
-      if( cacheslot->labels[i].label.font != NULL )
-          msFree( cacheslot->labels[i].label.font );
+      freeLabel(&(cacheslot->labels[i].label));
       msFreeShape(cacheslot->labels[i].poly); /* empties the shape */
       msFree(cacheslot->labels[i].poly); /* free's the pointer */
       for(j=0;j<cacheslot->labels[i].numstyles; j++) freeStyle(&(cacheslot->labels[i].styles[j]));