[mapserver-commits] r11769 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-05-30 10:25:05 -0700 (Mon, 30 May 2011)
New Revision: 11769

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

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2011-05-30 13:15:57 UTC (rev 11768)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2011-05-30 17:25:05 UTC (rev 11769)
@@ -13,6 +13,8 @@
 
 Current Version:
 ----------------
+- WFS: check if map projection is properly set before using it (#3897)
+
 - Fix for the memory corruption when mapping the string data type in the Java bindings (#3491)
 
 - Ensure the class is not marked BeforeFieldInit causing memory corruption with C#/CLR4 (#3438)

Modified: branches/branch-5-4/mapserver/mapwfs.c
===================================================================
--- branches/branch-5-4/mapserver/mapwfs.c	2011-05-30 13:15:57 UTC (rev 11768)
+++ branches/branch-5-4/mapserver/mapwfs.c	2011-05-30 17:25:05 UTC (rev 11769)
@@ -1130,7 +1130,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) {