[mapserver-commits] r9266 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-08-24 23:13:40 -0400 (Mon, 24 Aug 2009)
New Revision: 9266

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mappostgresql.c
Log:
Avoid double free with postgresql joins. (#2936)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-08-23 16:35:14 UTC (rev 9265)
+++ trunk/mapserver/HISTORY.TXT	2009-08-25 03:13:40 UTC (rev 9266)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Avoid double free with postgresql joins. (#2936)
+
 - Don't attempt to project layers given in pixel coordinates (layer->transform != MS_TRUE) (#3096)
 
 - Modify loading imagery from GDAL to load all bands at once to avoid multiple

Modified: trunk/mapserver/mappostgresql.c
===================================================================
--- trunk/mapserver/mappostgresql.c	2009-08-23 16:35:14 UTC (rev 9265)
+++ trunk/mapserver/mappostgresql.c	2009-08-25 03:13:40 UTC (rev 9266)
@@ -400,9 +400,7 @@
       joininfo->conn = NULL;
     }
 
-    if(joininfo->to_column) {
-      free(joininfo->to_column);
-    }
+    /* removed free(joininfo->to_column), see bug #2936 */
 
     if(joininfo->from_value) {
       free(joininfo->from_value);