[mapserver-commits] r9296 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2009-09-11 00:06:38 -0400 (Fri, 11 Sep 2009)
New Revision: 9296

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapresample.c
Log:
improve safety of nSrcX/nSrcY checks in nearest resampler (#3120)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-09-09 17:21:50 UTC (rev 9295)
+++ trunk/mapserver/HISTORY.TXT	2009-09-11 04:06:38 UTC (rev 9296)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Improve safety of srcx/y checks in nearest neighbour raster resampler (#3120)
+
 - Added support for 4d geometry types and oci bind variables for Oracle (#3107)
 
 - Fixed WCS processing when both crs and response_crs are specified (#3083)

Modified: trunk/mapserver/mapresample.c
===================================================================
--- trunk/mapserver/mapresample.c	2009-09-09 17:21:50 UTC (rev 9295)
+++ trunk/mapserver/mapresample.c	2009-09-11 04:06:38 UTC (rev 9296)
@@ -132,8 +132,10 @@
             /*
              * We test the original floating point values to 
              * avoid errors related to asymmetric rounding around zero.
+             * (Also note bug #3120 regarding nearly redundent x/y < 0 checks).
              */
             if( x[nDstX] < 0.0 || y[nDstX] < 0.0
+                || nSrcX < 0 || nSrcY < 0 
                 || nSrcX >= nSrcXSize || nSrcY >= nSrcYSize )
             {
                 continue;