[mapserver-commits] r11527 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-04-11 09:41:34 -0700 (Mon, 11 Apr 2011)
New Revision: 11527

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapimageio.c
   trunk/mapserver/maprendering.c
Log:
fix some valgrind found memory leaks (offset symbols, and gd io contexts)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-11 16:23:31 UTC (rev 11526)
+++ trunk/mapserver/HISTORY.TXT	2011-04-11 16:41:34 UTC (rev 11527)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- fix some valgrind found memory leaks (offset symbols, and gd io contexts)
+
 - skip marker symbol with no defined SYMBOL (caused some memory leaks with
   uninitialized vector points)
 

Modified: trunk/mapserver/mapimageio.c
===================================================================
--- trunk/mapserver/mapimageio.c	2011-04-11 16:23:31 UTC (rev 11526)
+++ trunk/mapserver/mapimageio.c	2011-04-11 16:41:34 UTC (rev 11527)
@@ -817,6 +817,7 @@
         msSetError(MS_MISCERR, "Unknown or unsupported format.", "saveImageGD()");
         return(MS_FAILURE);
     }
+    msFree(ctx);
 
     return MS_SUCCESS;
 }

Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-04-11 16:23:31 UTC (rev 11526)
+++ trunk/mapserver/maprendering.c	2011-04-11 16:41:34 UTC (rev 11527)
@@ -500,8 +500,10 @@
             }
          }
 
-         if(offsetLine!=p)
+         if(offsetLine!=p) {
             msFreeShape(offsetLine);
+            msFree(offsetLine);
+         }
       }
       else if( MS_RENDERER_IMAGEMAP(image->format) )
          msDrawLineSymbolIM(symbolset, image, p, style, scalefactor);
@@ -664,6 +666,7 @@
 cleanup:
          if (offsetPolygon != p) {
             msFreeShape(offsetPolygon);
+            msFree(offsetPolygon);
          }
          return ret;
       }