[mapserver-commits] r12544 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2011-09-13 09:14:20 -0700 (Tue, 13 Sep 2011)
New Revision: 12544

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapwcs.c
Log:
fix crash describing coverage when rangeset_axes contains value other than bands (#4006)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-09-13 16:11:32 UTC (rev 12543)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-09-13 16:14:20 UTC (rev 12544)
@@ -15,6 +15,8 @@
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
 
+- WCS 1.0: Fix crash with some _rangeset_axes values (#4020)
+
 - Changed msDrawVectorLayer() not to cache shapes if attribute binding is present after the first style (#3976)
 
 - Fix mapscript to build when TRUE macro is not defined (#3926)

Modified: branches/branch-6-0/mapserver/mapwcs.c
===================================================================
--- branches/branch-6-0/mapserver/mapwcs.c	2011-09-13 16:11:32 UTC (rev 12543)
+++ branches/branch-6-0/mapserver/mapwcs.c	2011-09-13 16:14:20 UTC (rev 12544)
@@ -296,7 +296,7 @@
         return;
 
     value = strstr(value,"bands");
-    if( value[5] != '\0' && value[5] != ' ' )
+    if( value == NULL || (value[5] != '\0' && value[5] != ' ') )
         return;
 
     /* Are there any w*s_bands_ metadata already? If so, skip out. */