aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-07-14 18:28:44 +0800
committerMilan Crha <mcrha@redhat.com>2010-07-14 18:28:44 +0800
commitecb600bbb40144caf409c245b44b3eadd70eb81d (patch)
tree56624195ab98a71b52e2b1ca0aaa34c693a6ca6a
parentb727a1a99e3ba478a59ee0565e51cf1de180fde2 (diff)
downloadgsoc2013-evolution-ecb600bbb40144caf409c245b44b3eadd70eb81d.tar
gsoc2013-evolution-ecb600bbb40144caf409c245b44b3eadd70eb81d.tar.gz
gsoc2013-evolution-ecb600bbb40144caf409c245b44b3eadd70eb81d.tar.bz2
gsoc2013-evolution-ecb600bbb40144caf409c245b44b3eadd70eb81d.tar.lz
gsoc2013-evolution-ecb600bbb40144caf409c245b44b3eadd70eb81d.tar.xz
gsoc2013-evolution-ecb600bbb40144caf409c245b44b3eadd70eb81d.tar.zst
gsoc2013-evolution-ecb600bbb40144caf409c245b44b3eadd70eb81d.zip
Bug #615049 - Crash in remove_contact at e-addressbook-model.c:202
-rw-r--r--addressbook/gui/widgets/e-addressbook-model.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index b469e8200d..b46068d3ae 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -199,10 +199,18 @@ remove_contact(EBookView *book_view,
const gchar *uid;
contact = array->pdata[ii];
+ /* check if already removed */
+ if (!contact)
+ continue;
+
uid = e_contact_get_const (contact, E_CONTACT_UID);
+ g_return_if_fail (uid != NULL);
+
if (strcmp (uid, target_uid) == 0) {
g_object_unref (contact);
g_array_append_val (indices, ii);
+ array->pdata[ii] = NULL;
+ break;
}
}
}