summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Scorgie <dscorgie@src.gnome.org>2007-09-03 19:26:35 +0000
committerDon Scorgie <dscorgie@src.gnome.org>2007-09-03 19:26:35 +0000
commit007433f07550aa4e5be1e8d47950d16049738415 (patch)
tree6c0c0f5d3861ab55b32cecaa080ab33942f9a06c
parentf7769c9e546bb1aa76552cebbab1d82cf7fd6e6e (diff)
downloadyelp-007433f07550aa4e5be1e8d47950d16049738415.tar.gz
If mime type isn't detected, don't crash bug #472128 based on patch by
* src/yelp-utils.c: If mime type isn't detected, don't crash bug #472128 based on patch by Hans Petter Jansson svn path=/trunk/; revision=2926
-rw-r--r--ChangeLog4
-rw-r--r--src/yelp-utils.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 41437448..9cfbcd9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-09-03 Don Scorgie <dscorgie@svn.gnome.org>
+ * src/yelp-utils.c:
+ If mime type isn't detected, don't crash
+ bug #472128 based on patch by Hans Petter Jansson
+
* src/yelp-debug.c:
* src/yelp-search-parser.c:
C89 fixes from Jens Granseuer (bug #472489)
diff --git a/src/yelp-utils.c b/src/yelp-utils.c
index 3a0436aa..46a8bf8a 100644
--- a/src/yelp-utils.c
+++ b/src/yelp-utils.c
@@ -73,7 +73,9 @@ resolve_process_ghelp (char *uri, gchar **result)
else
mime = gnome_vfs_get_mime_type (*result);
- if (g_str_equal (mime, "text/xml") ||
+ if (!mime) {
+ type = YELP_RRN_TYPE_ERROR;
+ } else if (g_str_equal (mime, "text/xml") ||
g_str_equal (mime, "application/docbook+xml") ||
g_str_equal (mime, "application/xml"))
type = YELP_RRN_TYPE_DOC;