[mapserver-commits] r11862 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-07-02 07:49:18 -0700 (Sat, 02 Jul 2011)
New Revision: 11862

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapsymbol.c
Log:
Fix double-free in msAddImageSymbol() when filename is a http resource (#3939)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-07-02 14:47:39 UTC (rev 11861)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-07-02 14:49:18 UTC (rev 11862)
@@ -14,6 +14,8 @@
 
 Version 6.0.1 (SVN branch-6-0):
 ---------------------------
+- Fix double-free in msAddImageSymbol() when filename is a http resource (#3939)
+
 - Fix rendering of lines with outlinewidth set if not on first style (#3935)
 
 - Added writing of cluster object when saving map. Also improved handling of

Modified: branches/branch-6-0/mapserver/mapsymbol.c
===================================================================
--- branches/branch-6-0/mapserver/mapsymbol.c	2011-07-02 14:47:39 UTC (rev 11861)
+++ branches/branch-6-0/mapserver/mapsymbol.c	2011-07-02 14:49:18 UTC (rev 11862)
@@ -365,7 +365,6 @@
                   symbol->imagepath = msStrdup(tmpfullfilename);
                   symbol->full_pixmap_path = msStrdup(tmpfullfilename);
               }
-              msFree(tmpfilename);
           }
           msFree(tmpfilename);
           msFree(tmppath);