diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-10-05 17:24:10 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-10-05 17:24:10 +0200 |
| commit | e69d16d1ad9b7b256e072c308674c9b908257827 (patch) | |
| tree | 4912aefc5fee3f2c86be4db0fb8b4ee2b9bf9c04 | |
| parent | 8e0e00ef2edf79ee39315a37ab60dc5d9ebc2aaf (diff) | |
| parent | 618156d4f506a9abae79ee61895c29f00beeca49 (diff) | |
| download | ayatana-indicator-datetime-e69d16d1ad9b7b256e072c308674c9b908257827.tar.gz ayatana-indicator-datetime-e69d16d1ad9b7b256e072c308674c9b908257827.tar.bz2 ayatana-indicator-datetime-e69d16d1ad9b7b256e072c308674c9b908257827.zip | |
Backport fix from Lars for a missing NULL check leading to segfault
(lp: #1061867)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/datetime-service.c | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 00d64de..6d796b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (12.10.2-0ubuntu2) UNRELEASED; urgency=low + + * Backport fix from Lars for a missing NULL check leading to segfault + (lp: #1061867) + + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 05 Oct 2012 17:23:38 +0200 + indicator-datetime (12.10.2-0ubuntu1) quantal; urgency=low * New upstream release: diff --git a/src/datetime-service.c b/src/datetime-service.c index 1a37fde..f0c45c0 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -734,6 +734,12 @@ update_appointment_menu_items (gpointer unused) ESource *source = E_SOURCE (s->data); ECalClient *ecal = e_cal_client_new(source, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, &gerror); + if (!ecal) { + g_debug ("Cannot create ecal client: %s", gerror->message); + g_clear_error (&gerror); + continue; + } + icaltimezone* current_zone = icaltimezone_get_builtin_timezone(current_timezone); if (!current_zone) { // current_timezone may be a TZID? |