[mapserver-commits] r9267 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-08-24 23:16:21 -0400 (Mon, 24 Aug 2009)
New Revision: 9267

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/mappostgresql.c
Log:
Avoid double free with postgresql joins. (#2936)

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-08-25 03:13:40 UTC (rev 9266)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-08-25 03:16:21 UTC (rev 9267)
@@ -14,6 +14,8 @@
 Current Version:
 ----------------
 
+- Avoid double free with postgresql joins. (#2936)
+
 - Fixed msMSSQL2008LayerGetShape to retrieve proper wkb geometries (#3082)
 
 - Fixed the shape index for the inline layers (#3074)

Modified: branches/branch-5-4/mapserver/mappostgresql.c
===================================================================
--- branches/branch-5-4/mapserver/mappostgresql.c	2009-08-25 03:13:40 UTC (rev 9266)
+++ branches/branch-5-4/mapserver/mappostgresql.c	2009-08-25 03:16:21 UTC (rev 9267)
@@ -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);