[mapserver-commits] r9407 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2009-10-08 00:36:24 -0400 (Thu, 08 Oct 2009)
New Revision: 9407

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwcs.c
Log:
Fix WCS crash with use of datasets that aren't physical files (#2901).

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-08 03:37:34 UTC (rev 9406)
+++ trunk/mapserver/HISTORY.TXT	2009-10-08 04:36:24 UTC (rev 9407)
@@ -47,7 +47,9 @@
 
 - Fix WCS coverage metadata handling if size/resolution missing (#2683).
 
+- Fix WCS crash with use of datasets that aren't physical files (#2901).
 
+
 Version 5.6.0-beta2 (2009-10-01):
 ---------------------------------
 

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2009-10-08 03:37:34 UTC (rev 9406)
+++ trunk/mapserver/mapwcs.c	2009-10-08 04:36:24 UTC (rev 9407)
@@ -2024,8 +2024,9 @@
   
     msGDALInitialize();
 
+    msTryBuildPath3(szPath,  layer->map->mappath, layer->map->shapepath, layer->data);
     msAcquireLock( TLOCK_GDAL );
-    hDS = GDALOpen(msTryBuildPath3(szPath,  layer->map->mappath, layer->map->shapepath, layer->data) , GA_ReadOnly );
+    hDS = GDALOpen( szPath, GA_ReadOnly );
     if( hDS == NULL ) {
       msReleaseLock( TLOCK_GDAL );
       msSetError( MS_IOERR, "%s", "msWCSGetCoverageMetadata()", CPLGetLastErrorMsg() );