[mapserver-commits] r10712 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2010-11-09 05:16:17 -0800 (Tue, 09 Nov 2010)
New Revision: 10712

Modified:
   trunk/mapserver/mapwmslayer.c
Log:
Do not seg fault if ows_srs not set and lp->projection is set (#3543)

Modified: trunk/mapserver/mapwmslayer.c
===================================================================
--- trunk/mapserver/mapwmslayer.c	2010-11-09 12:42:11 UTC (rev 10711)
+++ trunk/mapserver/mapwmslayer.c	2010-11-09 13:16:17 UTC (rev 10712)
@@ -737,9 +737,10 @@
         const char *ows_srs;
         rectObj  layer_rect;
 
-        ows_srs = msOWSGetEPSGProj(NULL,&(lp->metadata), "MO", MS_FALSE);
+        ows_srs = msOWSGetEPSGProj(&(lp->projection), &(lp->metadata), 
+                                   "MO", MS_FALSE);
 
-        if( strchr(ows_srs,' ') == NULL 
+        if( ows_srs && strchr(ows_srs,' ') == NULL 
             && msOWSGetLayerExtent( map, lp, "MO", &layer_rect) == MS_SUCCESS )
         {
             /* fulloverlap */