[GRASS-SVN] r60406 - grass/branches/releasebranch_6_4/lib/gis

svn_grass at osgeo.org svn_grass at osgeo.org
Thu May 22 00:30:14 PDT 2014


Author: hamish
Date: 2014-05-22 00:30:14 -0700 (Thu, 22 May 2014)
New Revision: 60406

Modified:
   grass/branches/releasebranch_6_4/lib/gis/raster_metadata.c
Log:
bugfix: G__raster_misc_read_line() was returning with a successful exit code but uninitialized memory if metadata file existed but was empty (e.g. when vdatum="") (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/lib/gis/raster_metadata.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/gis/raster_metadata.c	2014-05-22 07:26:29 UTC (rev 60405)
+++ grass/branches/releasebranch_6_4/lib/gis/raster_metadata.c	2014-05-22 07:30:14 UTC (rev 60406)
@@ -113,6 +113,7 @@
     }
     if (G_getl2(buff, sizeof(buff) - 1, fd) == 0) {
 	/* file is empty */
+	strcpy(str, "");
 	return fclose(fd);
     }
 



More information about the grass-commit mailing list