[mapserver-commits] r11158 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2011-03-15 07:21:44 -0700 (Tue, 15 Mar 2011)
New Revision: 11158

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/shp2img.c
Log:
Fixed segmentation fault when parsing invalid extent arguments in shp2img (#3734)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-13 22:05:54 UTC (rev 11157)
+++ trunk/mapserver/HISTORY.TXT	2011-03-15 14:21:44 UTC (rev 11158)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed segmentation fault when parsing invalid extent arguments in shp2img (#3734)
+
 - Make "openlayers mode" work even without OWS support (#3732)
 
 - Add a static table to define the axis order for soem epsg codes (#3582)

Modified: trunk/mapserver/shp2img.c
===================================================================
--- trunk/mapserver/shp2img.c	2011-03-13 22:05:54 UTC (rev 11157)
+++ trunk/mapserver/shp2img.c	2011-03-15 14:21:44 UTC (rev 11158)
@@ -239,6 +239,12 @@
     }
     
     if(strcmp(argv[i],"-e") == 0) { /* change extent */
+        if( argc <= i+4 ) {
+            fprintf( stderr, 
+                     "Argument -e needs 4 space separated numbers as argument.\n" ); 
+            msCleanup();
+            exit(0);
+        }
       map->extent.minx = atof(argv[i+1]);
       map->extent.miny = atof(argv[i+2]);
       map->extent.maxx = atof(argv[i+3]);