[mapserver-commits] r11117 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2011-03-08 11:49:23 -0800 (Tue, 08 Mar 2011)
New Revision: 11117

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maporaclespatial.c
Log:
Fixed Core Dump from Format=KML/Z with Oracle Spatial layers (#3713)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-08 19:19:48 UTC (rev 11116)
+++ trunk/mapserver/HISTORY.TXT	2011-03-08 19:49:23 UTC (rev 11117)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed Core Dump from Format=KML/Z with Oracle Spatial layers (#3713)
+
 - Call msPluginFreeVirtualTableFactory from msCleanup (#2164)
 
 - Avoid the crash if anglemode 'FOLLOW' is specified with bitmap fonts. (#3379)

Modified: trunk/mapserver/maporaclespatial.c
===================================================================
--- trunk/mapserver/maporaclespatial.c	2011-03-08 19:19:48 UTC (rev 11116)
+++ trunk/mapserver/maporaclespatial.c	2011-03-08 19:49:23 UTC (rev 11117)
@@ -3185,8 +3185,6 @@
                                                  layer->items[count_item-1], 
                                                  pard );
             }
-            else
-                layer->numitems--;
         }
         else
             existgeom = 1;
@@ -3195,6 +3193,9 @@
         free(flk); /* Better?!*/
         flk_len = 0;
     }
+
+    layer->numitems = count_item;
+
     if (!(existgeom))
     {
         msSetError (MS_ORACLESPATIALERR, "No geometry column, check stmt", "msOracleSpatialLayerGetItems()" );