[mapserver-commits] r11664 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-05-09 06:29:13 -0700 (Mon, 09 May 2011)
New Revision: 11664

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapunion.c
Log:
Union layer: Fixed the potential seg fault when STYLEITEM AUTO is used (#3859)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-05-06 14:27:28 UTC (rev 11663)
+++ trunk/mapserver/HISTORY.TXT	2011-05-09 13:29:13 UTC (rev 11664)
@@ -15,7 +15,7 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
-- ...
+- Union layer: Fixed the potential seg fault when STYLEITEM AUTO is used (#3859)
 
 Version 6.0.0-rc2 (2011-05-05)
 ------------------------------

Modified: trunk/mapserver/mapunion.c
===================================================================
--- trunk/mapserver/mapunion.c	2011-05-06 14:27:28 UTC (rev 11663)
+++ trunk/mapserver/mapunion.c	2011-05-09 13:29:13 UTC (rev 11664)
@@ -420,7 +420,7 @@
                         else 
                             break;
                     }
-                    if(strcasecmp(srclayer->styleitem, "AUTO") != 0) 
+                    if(srclayer->styleitem && strcasecmp(srclayer->styleitem, "AUTO") != 0) 
                     {
                         /* Generic feature style handling as per RFC-61 */
                         msLayerGetFeatureStyle(layer->map, srclayer, srclayer->class[layerinfo->classIndex], shape);