diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-05-26 00:19:02 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-05-26 00:19:02 +0800 |
| commit | 8236cce314ca23ae258687c7c523b08ea0a98879 (patch) | |
| tree | e6cf04259dd45e7fb04248d416bd895fc7bcd9d8 /addressbook/gui/component | |
| parent | 69571e706336eff05fe5a0228606856db8311fbf (diff) | |
| download | gsoc2013-evolution-8236cce314ca23ae258687c7c523b08ea0a98879.tar.gz gsoc2013-evolution-8236cce314ca23ae258687c7c523b08ea0a98879.tar.zst gsoc2013-evolution-8236cce314ca23ae258687c7c523b08ea0a98879.zip | |
Don't assume the relative URI is non-NULL (#427232).
2007-05-25 Matthew Barnes <mbarnes@redhat.com>
* addressbook/gui/component/addressbook-component.c (ensure_sources):
* addressbook/gui/component/addressbook-migrate.c (ensure_sources):
* calendar/gui/migration.c (create_calendar_sources),
(create_task_sources), (create_memo_sources):
* calendar/gui/tasks-component.c (ensure_sources):
* calendar/gui/calendar-component.c (ensure_sources):
* calendar/gui/memos-component.c (ensure_sources):
* plugins/hula-account-setup/camel-hula-listener.c
(remove_esource), (modify_esource):
* plugins/groupwise-account-setup/camel-gw-listener.c
(remove_esource), (modify_esource):
Don't assume the relative URI is non-NULL (#427232).
* plugins/exchange-operations/exchange-config-listener.c
(exchange_add_autocompletion_folders):
Don't assume the absolute URI is non-NULL (#427232).
svn path=/trunk/; revision=33577
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 7 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-migrate.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index af65240d83..3f20c5f6d8 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -118,7 +118,12 @@ ensure_sources (AddressbookComponent *component) GSList *s; for (s = sources; s; s = s->next) { ESource *source = E_SOURCE (s->data); - if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { + const gchar *relative_uri; + + relative_uri = e_source_peek_relative_uri (source); + if (relative_uri == NULL) + continue; + if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { personal_source = source; break; } diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 70518239ed..18a58a032a 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -472,7 +472,12 @@ create_groups (MigrationContext *context, GSList *s; for (s = sources; s; s = s->next) { ESource *source = E_SOURCE (s->data); - if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { + const gchar *relative_uri; + + relative_uri = e_source_peek_relative_uri (source); + if (relative_uri == NULL) + continue; + if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { *personal_source = g_object_ref (source); break; } |