diff options
| -rw-r--r-- | plugins/itip-formatter/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/itip-formatter/itip-formatter.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index 57857a86a6..bb4ae062d5 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,10 @@ +2007-11-23 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #458237 + + * itip-formatter.c: (start_calendar_server), (source_selected_cb): + Check for non-NULL source before using it to prevent a crash. + 2007-10-26 Kjartan Maraas <kmaraas@gnome.org> * itip-view.c: (itip_view_get_source_list), (itip_view_get_source), diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 7d7fabfe01..4dabf551a8 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -466,6 +466,8 @@ start_calendar_server (FormatItipPObject *pitip, ESource *source, ECalSourceType ECal *ecal; icaltimezone *zone = NULL; + g_return_val_if_fail (source != NULL, NULL); + ecal = g_hash_table_lookup (pitip->ecals[type], e_source_peek_uid (source)); if (ecal) { pitip->current_ecal = ecal; @@ -520,6 +522,8 @@ source_selected_cb (ItipView *view, ESource *source, gpointer data) itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE); + g_return_if_fail (source != NULL); + start_calendar_server (pitip, source, pitip->type, cal_opened_cb, pitip); } |