[mapserver-commits] r12762 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-11-08 02:23:04 -0800 (Tue, 08 Nov 2011)
New Revision: 12762

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

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2011-11-08 10:22:55 UTC (rev 12761)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2011-11-08 10:23:04 UTC (rev 12762)
@@ -13,6 +13,7 @@
 
 Version 5.6.8 (SVN branch-5-6):
 ---------------------------
+- fix segfault on join with postgresql tables (#4074)
 
 - define Z_BEST_COMPRESSION for newer libpng versions (#4033)
 

Modified: branches/branch-5-6/mapserver/mappostgresql.c
===================================================================
--- branches/branch-5-6/mapserver/mappostgresql.c	2011-11-08 10:22:55 UTC (rev 12761)
+++ branches/branch-5-6/mapserver/mappostgresql.c	2011-11-08 10:23:04 UTC (rev 12762)
@@ -321,7 +321,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",