[mapserver-commits] r9641 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2009-12-26 13:22:14 -0500 (Sat, 26 Dec 2009)
New Revision: 9641

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwcs.c
Log:
honour maxsize limits on WCS responses (#3204)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-12-26 17:42:24 UTC (rev 9640)
+++ trunk/mapserver/HISTORY.TXT	2009-12-26 18:22:14 UTC (rev 9641)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Honour MAXSIZE for WCS responses (#3204)
+
 - Implemented RFC 52 LayerResultsGetShape support for OGR connection type.
 
 - Fixed uninitialized variable with malloc used in osPointCluster() (#3236)

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2009-12-26 17:42:24 UTC (rev 9640)
+++ trunk/mapserver/mapwcs.c	2009-12-26 18:22:14 UTC (rev 9641)
@@ -1647,6 +1647,15 @@
   map->width = params->width;
   map->height = params->height;
 
+  /* Are we exceeding the MAXSIZE limit on result size? */
+  if(map->width > map->maxsize || map->height > map->maxsize )
+  {
+      msSetError(MS_WCSERR, "Raster size out of range, width and height must be no more than MAXSIZE=%d.", "msWCSGetCoverage()", map->maxsize);
+
+      return msWCSException(map, "InvalidParameterValue", 
+                            "width/height", params->version);
+  }
+
   /* adjust OWS BBOX to MapServer's pixel model */
   if( strncasecmp(params->version,"1.0",3) == 0 ) {
     params->bbox.minx += params->resx*0.5;