[mapserver-commits] r11294 - trunk/mapserver

[svn at osgeo.org]

Author: schpidi
Date: 2011-03-21 08:44:55 -0700 (Mon, 21 Mar 2011)
New Revision: 11294

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maputil.c
Log:
Correcting double free in msCleanup().


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-21 12:03:08 UTC (rev 11293)
+++ trunk/mapserver/HISTORY.TXT	2011-03-21 15:44:55 UTC (rev 11294)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Correct double free in msCleanup().
+
 - Initialize default formats in WCS.
 
 - Fix csharp Makefile.in (#3758)

Modified: trunk/mapserver/maputil.c
===================================================================
--- trunk/mapserver/maputil.c	2011-03-21 12:03:08 UTC (rev 11293)
+++ trunk/mapserver/maputil.c	2011-03-21 15:44:55 UTC (rev 11294)
@@ -1790,7 +1790,11 @@
   msForceTmpFileBase( NULL );
   msConnPoolFinalCleanup();
   /* Lexer string parsing variable */
-  msFree(msyystring_buffer);
+  if (msyystring_buffer != NULL)
+  {
+    msFree(msyystring_buffer);
+    msyystring_buffer = NULL;
+  }
   msyylex_destroy();
 
 #ifdef USE_OGR