[GRASS-SVN] r33626 - grass/branches/develbranch_6/lib/gis

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-09-30 17:34:18 -0400 (Tue, 30 Sep 2008)
New Revision: 33626

Modified:
   grass/branches/develbranch_6/lib/gis/open.c
Log:
glynn: Prevent segfault if mapset == NULL (merge from trunk, r33624)

Modified: grass/branches/develbranch_6/lib/gis/open.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/open.c	2008-09-30 20:31:56 UTC (rev 33625)
+++ grass/branches/develbranch_6/lib/gis/open.c	2008-09-30 21:34:18 UTC (rev 33626)
@@ -66,7 +66,7 @@
 	    name = xname;
 	    mapset = xmapset;
 	}
-	else if (!*mapset)
+	else if (!mapset || !*mapset)
 	    mapset = G_find_file2(element, name, mapset);
 
 	if (!mapset)