[mapserver-commits] r11773 - branches/branch-5-2/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-05-31 12:00:43 -0700 (Tue, 31 May 2011)
New Revision: 11773

Modified:
   branches/branch-5-2/mapserver/HISTORY.TXT
   branches/branch-5-2/mapserver/mapwfs.c
Log:
WFS: check if map projection is properly set before using it (#3897)

Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT	2011-05-30 22:20:23 UTC (rev 11772)
+++ branches/branch-5-2/mapserver/HISTORY.TXT	2011-05-31 19:00:43 UTC (rev 11773)
@@ -12,6 +12,8 @@
 Current Version:
 ----------------
 
+- WFS: check if map projection is properly set before using it (#3897)
+
 - Disabled some insecure (and potentially exploitable) mapserv command-line
   debug arguments (#3485). The --enable-cgi-cl-debug-args configure switch
   can be used to re-enable them for devs who really cannot get away without

Modified: branches/branch-5-2/mapserver/mapwfs.c
===================================================================
--- branches/branch-5-2/mapserver/mapwfs.c	2011-05-30 22:20:23 UTC (rev 11772)
+++ branches/branch-5-2/mapserver/mapwfs.c	2011-05-31 19:00:43 UTC (rev 11773)
@@ -1127,7 +1127,8 @@
           /* get the extent of the layer (bbox will get further filtered later */
           /* if the client specifies BBOX or a spatial filter */
 
-          if (msOWSGetLayerExtent(map, lp, "FO", &ext) == MS_SUCCESS) {
+          if (msOWSGetLayerExtent(map, lp, "FO", &ext) == MS_SUCCESS &&
+              pszMapSRS != NULL) {
             sprintf(szBuf, "init=epsg:%.10s", pszMapSRS+5);
 
             if (szBuf != NULL) {