diff options
| author | Rupert Swarbrick <rswarbrick@gmail.com> | 2010-12-16 23:56:21 +0000 |
|---|---|---|
| committer | Shaun McCance <shaunm@gnome.org> | 2010-12-20 10:45:24 -0500 |
| commit | 6dc128e493e294cc72cd4380e1d3ec1e5675ddbd (patch) | |
| tree | aa91af6a6db83eaa976f3347d1af1ce6215381fa | |
| parent | fab59cda8b3020609de63bb30b986f649d25a8f2 (diff) | |
| download | yelp-6dc128e493e294cc72cd4380e1d3ec1e5675ddbd.tar.gz | |
Fail more gracefully in bookmark functions if we get passed a null.
The new (at least) man parsing code obviously has a bug where it's not
setting a page_id that it should. But this shouldn't cause a segfault!
| -rw-r--r-- | src/yelp-application.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/yelp-application.c b/src/yelp-application.c index 0921d163..cae00ddd 100644 --- a/src/yelp-application.c +++ b/src/yelp-application.c @@ -674,6 +674,9 @@ yelp_application_remove_bookmark (YelpBookmarks *bookmarks, GSettings *settings; YelpApplication *app = YELP_APPLICATION (bookmarks); + g_return_if_fail (page_id); + g_return_if_fail (doc_uri); + settings = application_get_doc_settings (app, doc_uri); if (settings) { @@ -704,6 +707,9 @@ yelp_application_is_bookmarked (YelpBookmarks *bookmarks, GSettings *settings; YelpApplication *app = YELP_APPLICATION (bookmarks); + g_return_if_fail (page_id); + g_return_if_fail (doc_uri); + settings = application_get_doc_settings (app, doc_uri); if (settings == NULL) return FALSE; @@ -731,6 +737,9 @@ yelp_application_update_bookmarks (YelpApplication *app, { GSettings *settings; + g_return_if_fail (page_id); + g_return_if_fail (doc_uri); + settings = application_get_doc_settings (app, doc_uri); if (settings) { |