[mapserver-commits] r11669 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-05-10 09:00:12 -0700 (Tue, 10 May 2011)
New Revision: 11669

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapunion.c
Log:
Fixed a potential seg fault in msUnionLayerNextShape (#3859)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-05-10 15:31:59 UTC (rev 11668)
+++ trunk/mapserver/HISTORY.TXT	2011-05-10 16:00:12 UTC (rev 11669)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- Union layer: Fixed a potential seg fault in msUnionLayerNextShape (#3859)
+
 - Cluster layer: Fixed the problem when returning undefined attribute (#3700)
 
 - Union layer: Fix for the item initialization at the source layer (#3859)

Modified: trunk/mapserver/mapunion.c
===================================================================
--- trunk/mapserver/mapunion.c	2011-05-10 15:31:59 UTC (rev 11668)
+++ trunk/mapserver/mapunion.c	2011-05-10 16:00:12 UTC (rev 11669)
@@ -433,9 +433,9 @@
 
     while (layerinfo->layerIndex < layerinfo->layerCount)
     {
+        srclayer = &layerinfo->layers[layerinfo->layerIndex];
         if (layerinfo->status[layerinfo->layerIndex] == MS_SUCCESS)
         {
-            srclayer = &layerinfo->layers[layerinfo->layerIndex];
             while ((rv = srclayer->vtable->LayerNextShape(srclayer, shape)) == MS_SUCCESS)
             {
                 if(layer->styleitem)