[mapserver-commits] r11861 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-07-02 07:47:39 -0700 (Sat, 02 Jul 2011)
New Revision: 11861

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

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-07-02 14:32:53 UTC (rev 11860)
+++ trunk/mapserver/HISTORY.TXT	2011-07-02 14:47:39 UTC (rev 11861)
@@ -13,7 +13,10 @@
 For a complete change history, please see the Subversion log comments.
 
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
-------------------------------------------------- 
+-------------------------------------------------
+
+- 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)
 
 - Correct SLD with spatial filters bbox and intersects (#3929)

Modified: trunk/mapserver/mapsymbol.c
===================================================================
--- trunk/mapserver/mapsymbol.c	2011-07-02 14:32:53 UTC (rev 11860)
+++ trunk/mapserver/mapsymbol.c	2011-07-02 14:47:39 UTC (rev 11861)
@@ -363,7 +363,6 @@
                   symbol->imagepath = msStrdup(tmpfullfilename);
                   symbol->full_pixmap_path = msStrdup(tmpfullfilename);
               }
-              msFree(tmpfilename);
           }
           msFree(tmpfilename);
           msFree(tmppath);