[mapserver-commits] r11200 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2011-03-17 10:24:33 -0700 (Thu, 17 Mar 2011)
New Revision: 11200

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maporaclespatial.c
Log:
Fixed big Oracle memory leak when rendering in KML (#3719)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-17 16:38:51 UTC (rev 11199)
+++ trunk/mapserver/HISTORY.TXT	2011-03-17 17:24:33 UTC (rev 11200)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed big Oracle memory leak when rendering in KML (#3719)
+
 - avoid linking in postgres dependencies unnecessarily (#3708)
 
 - don't initialize outputformats until they are selected

Modified: trunk/mapserver/maporaclespatial.c
===================================================================
--- trunk/mapserver/maporaclespatial.c	2011-03-17 16:38:51 UTC (rev 11199)
+++ trunk/mapserver/maporaclespatial.c	2011-03-17 17:24:33 UTC (rev 11200)
@@ -3115,8 +3115,10 @@
 
     if (layer->numitems > 0)
     {
-        sthand->items_query = (item_text_array_query *)malloc( sizeof(item_text_array_query) * (layer->numitems) );
         if (sthand->items_query == NULL)
+            sthand->items_query = (item_text_array_query *)malloc( sizeof(item_text_array_query) * (layer->numitems) );
+
+        if (sthand->items_query == NULL)
         {
             msSetError( MS_ORACLESPATIALERR,"Cannot allocate items buffer", "msOracleSpatialLayerGetItems()" );
             if (geom_column_name) free(geom_column_name);