aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-11-26 01:21:22 +0800
committerMilan Crha <mcrha@redhat.com>2010-11-26 01:21:22 +0800
commit2e1a37d574b322186ebfe5fc78ec4865c3bd300c (patch)
tree88c5a5d1c954f22a2ac0f23a9a9d7a1caa0390ba
parente39dd931bcff0dfd6964a75c5b23c8e89f75d297 (diff)
downloadgsoc2013-evolution-2e1a37d574b322186ebfe5fc78ec4865c3bd300c.tar
gsoc2013-evolution-2e1a37d574b322186ebfe5fc78ec4865c3bd300c.tar.gz
gsoc2013-evolution-2e1a37d574b322186ebfe5fc78ec4865c3bd300c.tar.bz2
gsoc2013-evolution-2e1a37d574b322186ebfe5fc78ec4865c3bd300c.tar.lz
gsoc2013-evolution-2e1a37d574b322186ebfe5fc78ec4865c3bd300c.tar.xz
gsoc2013-evolution-2e1a37d574b322186ebfe5fc78ec4865c3bd300c.tar.zst
gsoc2013-evolution-2e1a37d574b322186ebfe5fc78ec4865c3bd300c.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) {