Don't crash when trying to load text files bug #549986 - Josselin Mouette

* src/yelp-utils.c (resolve_is_man_path):
Don't crash when trying to load text files
bug #549986 - Josselin Mouette

svn path=/trunk/; revision=3182

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a50979a6..595f305b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-01  Don Scorgie  <dscorgie@svn.gnome.org>
+
+	* src/yelp-utils.c (resolve_is_man_path):
+	Don't crash when trying to load text files
+	bug #549986 - Josselin Mouette
+
 2008-08-14  J.H.M. Dassen (Ray)  <jdassen@debian.org>
 
 	* src/yelp-info-parser.c (yelp_info_parser_parse_file):
diff --git a/src/yelp-utils.c b/src/yelp-utils.c
index a506b4df..13fe6925 100644
--- a/src/yelp-utils.c
+++ b/src/yelp-utils.c
@@ -136,7 +136,7 @@ resolve_is_man_path (const gchar *path, const gchar *encoding)
     iter = cats;
 
     if (encoding && *encoding) {
-	while (iter) {
+	while (iter && *iter) {
 	    gchar *ending = g_strdup_printf ("%s.%s", *iter, encoding);
 	    if (g_str_has_suffix (path, ending)) {
 		g_free (ending);
@@ -146,7 +146,7 @@ resolve_is_man_path (const gchar *path, const gchar *encoding)
 	    iter++;
 	}
     } else {
-	while (iter) {
+	while (iter && *iter) {
 	    if (g_str_has_suffix (path, *iter)) {
 		return TRUE;
 	    }