[mapserver-commits] r9722 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-01-21 10:31:34 -0500 (Thu, 21 Jan 2010)
New Revision: 9722

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maptemplate.c
Log:
Fixed memory leak related to templates (#2996)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-01-21 15:23:22 UTC (rev 9721)
+++ trunk/mapserver/HISTORY.TXT	2010-01-21 15:31:34 UTC (rev 9722)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed memory leak related to templates (#2996)
+
 - Added support of 44xx gtypes in oracle spatial driver (#2830)
 
 - Fixed curl proxy auth support for http connections (#571)

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2010-01-21 15:23:22 UTC (rev 9721)
+++ trunk/mapserver/maptemplate.c	2010-01-21 15:31:34 UTC (rev 9722)
@@ -3748,7 +3748,10 @@
       else 
         template = lp->template;
 
-      if(msReturnPage(mapserv, template, QUERY, papszBuffer) != MS_SUCCESS) return MS_FAILURE;
+      if(msReturnPage(mapserv, template, QUERY, papszBuffer) != MS_SUCCESS) {
+        msFreeShape(&(mapserv->resultshape)); 
+        return MS_FAILURE;
+      }
 
       msFreeShape(&(mapserv->resultshape)); /* init too */