Don't crash when manpath (prog) || MANPATH (env.) is available

* src/yelp-utils.c:
Don't crash when manpath (prog) || MANPATH (env.) is available

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 40f84be3..11f9f7fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-05  Don Scorgie  <dscorgie@cvs.gnome.org>
+
+	* src/yelp-utils.c: 
+	Don't crash when manpath (prog) || MANPATH (env.)
+	is available
+	
 ==================== 2.16.1 ====================
 2006-10-02  Don Scorgie  <dscorgie@cvs.gnome.org>
 
diff --git a/src/yelp-utils.c b/src/yelp-utils.c
index 48cce7fe..445f7be5 100644
--- a/src/yelp-utils.c
+++ b/src/yelp-utils.c
@@ -788,7 +788,9 @@ convert_man_uri (gchar *uri, gboolean trust_uri)
 
 	if (!g_spawn_command_line_sync ("manpath", &manp, NULL, NULL, NULL))
 	    manp = g_strdup (g_getenv ("MANPATH"));
-
+	if (!manp) {
+	    return NULL;
+	}
 	g_strstrip (manp);
 	manpath = g_strsplit (manp, ":", -1);