[GRASS-SVN] r71567 - grass/trunk/raster/r.in.gdal

[svn_grass at osgeo.org]

Author: mmetz
Date: 2017-10-18 12:49:36 -0700 (Wed, 18 Oct 2017)
New Revision: 71567

Modified:
   grass/trunk/raster/r.in.gdal/main.c
   grass/trunk/raster/r.in.gdal/proj.c
Log:
r.in.gdal: warning if there are subdatasets, fix segfault

Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c	2017-10-17 20:43:49 UTC (rev 71566)
+++ grass/trunk/raster/r.in.gdal/main.c	2017-10-18 19:49:36 UTC (rev 71567)
@@ -371,6 +371,20 @@
 		    "(%s or %s)."), "i.rectify -t", "gdalwarp -tps");
     }
 
+    /* does the driver support subdatasets? */
+    /* test for capability GDAL_DMD_SUBDATASETS */
+    
+    /* does the dataset include subdatasets? */
+    {
+	char **sds = GDALGetMetadata(hDS, "SUBDATASETS");
+
+	if (sds && *sds) {
+	    G_warning(_("Input contains subdatasets which may need to "
+	                "be imported separately"));
+	    /* list subdatasets? */
+	}
+    }
+
     if (flag_p->answer) {
         /* print number of bands */
         fprintf(stdout, "%d\n", GDALGetRasterCount(hDS));

Modified: grass/trunk/raster/r.in.gdal/proj.c
===================================================================
--- grass/trunk/raster/r.in.gdal/proj.c	2017-10-17 20:43:49 UTC (rev 71566)
+++ grass/trunk/raster/r.in.gdal/proj.c	2017-10-18 19:49:36 UTC (rev 71567)
@@ -240,6 +240,7 @@
 		msg_fn = G_fatal_error;
 	    msg_fn(error_msg);
 	    if (check_only) {
+		GDALClose(hDS);
 		exit(EXIT_FAILURE);
 	    }
 	}