aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-11-26 01:21:22 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:04 +0800
commit0f1b35a8c3ade6e265e93a862cbebfa53facb1f3 (patch)
treea205d602b06fa2a9ac46aa61cd2b48633802114f
parent48d805df31ec77d001c097b01e1788755e9fd8eb (diff)
downloadgsoc2013-evolution-0f1b35a8c3ade6e265e93a862cbebfa53facb1f3.tar.gz
gsoc2013-evolution-0f1b35a8c3ade6e265e93a862cbebfa53facb1f3.tar.zst
gsoc2013-evolution-0f1b35a8c3ade6e265e93a862cbebfa53facb1f3.zip
Bug #634387 - Crash in bbdb_sync_buddy_list_in_thread
-rw-r--r--plugins/bbdb/gaimbuddies.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index ebafc85f7a..62fc89d9ec 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -208,7 +208,7 @@ bbdb_sync_buddy_list_in_thread (gpointer data)
for (l = std->blist; l != NULL; l = l->next) {
GaimBuddy *b = l->data;
EBookQuery *query;
- GList *contacts;
+ GList *contacts = NULL;
GError *error = NULL;
EContact *c;
@@ -219,7 +219,10 @@ bbdb_sync_buddy_list_in_thread (gpointer data)
/* Look for an exact match full name == buddy alias */
query = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, b->alias);
- e_book_get_contacts (std->book, query, &contacts, NULL);
+ if (!e_book_get_contacts (std->book, query, &contacts, NULL)) {
+ e_book_query_unref (query);
+ continue;
+ }
e_book_query_unref (query);
if (contacts != NULL) {