[mapserver-commits] r9905 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-02-27 16:16:03 -0500 (Sat, 27 Feb 2010)
New Revision: 9905

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapgraticule.c
Log:
fix crash with GRID layers with no classes (#3352)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-02-25 20:25:37 UTC (rev 9904)
+++ trunk/mapserver/HISTORY.TXT	2010-02-27 21:16:03 UTC (rev 9905)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fix crash with GRID layers with no classes (#3352)
+
 - Remove "legacy" raster support, all raster rendering via GDAL now.
 
 - Very preliminary render plugin support for raster rendering. (RFC 54)

Modified: trunk/mapserver/mapgraticule.c
===================================================================
--- trunk/mapserver/mapgraticule.c	2010-02-25 20:25:37 UTC (rev 9904)
+++ trunk/mapserver/mapgraticule.c	2010-02-27 21:16:03 UTC (rev 9905)
@@ -79,8 +79,11 @@
   pInfo->dwhichlatitude = -90.0;
   pInfo->dwhichlongitude = -180.0;
   pInfo->bvertical = 1;
-  
-  if( layer->class[0]->label.size == -1 )
+
+  if( layer->numclasses == 0 )
+      msDebug( "GRID layer has no classes, nothing will be rendered.\n" );
+
+  if( layer->numclasses == 0 || layer->class[0]->label.size == -1 )
     pInfo->blabelaxes = 0;
   else
     pInfo->blabelaxes = 1;