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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-11-08 02:22:55 -0800 (Tue, 08 Nov 2011)
New Revision: 12761

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mappostgresql.c
Log:
fix segfault on join with postgresql tables (#4074)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-11-08 10:15:16 UTC (rev 12760)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-11-08 10:22:55 UTC (rev 12761)
@@ -14,6 +14,7 @@
 
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
+- fix segfault on join with postgresql tables (#4074)
 
 - Fixed Python Mapscript does not write COLOR to reference map (#4042)
  

Modified: branches/branch-6-0/mapserver/mappostgresql.c
===================================================================
--- branches/branch-6-0/mapserver/mappostgresql.c	2011-11-08 10:15:16 UTC (rev 12760)
+++ branches/branch-6-0/mapserver/mappostgresql.c	2011-11-08 10:22:55 UTC (rev 12761)
@@ -326,7 +326,7 @@
         }
 
         /* Create the query string. */
-        sql = (char *)malloc(24 + strlen(columns) + strlen(join->table) + 
+        sql = (char *)malloc(26 + strlen(columns) + strlen(join->table) + 
                 strlen(join->to) + strlen(joininfo->from_value));
         if(!sql) {
             msSetError(MS_MEMERR, "Failure to malloc.\n",