aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-05-22 02:37:21 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-05-22 02:37:21 +0800
commit4099872e4054e2a88b251800b5a93364e090263e (patch)
tree9ffa99c7e29a7283a46f7d5a00e177327073e52a
parentdf51052128301af403c967b52176e34946bbe318 (diff)
downloadgsoc2013-evolution-4099872e4054e2a88b251800b5a93364e090263e.tar
gsoc2013-evolution-4099872e4054e2a88b251800b5a93364e090263e.tar.gz
gsoc2013-evolution-4099872e4054e2a88b251800b5a93364e090263e.tar.bz2
gsoc2013-evolution-4099872e4054e2a88b251800b5a93364e090263e.tar.lz
gsoc2013-evolution-4099872e4054e2a88b251800b5a93364e090263e.tar.xz
gsoc2013-evolution-4099872e4054e2a88b251800b5a93364e090263e.tar.zst
gsoc2013-evolution-4099872e4054e2a88b251800b5a93364e090263e.zip
Don't try to invoke e_book_get_uri() on NULL. Fixes #20069.
* gui/component/addressbook.c (load_uri_cb): Don't try to invoke e_book_get_uri() on NULL. Fixes #20069. svn path=/trunk/; revision=16968
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/addressbook.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index fc4c953f7d..ddc84fec84 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-21 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/component/addressbook.c (load_uri_cb): Don't try to invoke
+ e_book_get_uri() on NULL. Fixes #20069.
+
2002-05-17 Chris Toshok <toshok@ximian.com>
* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 332ddf3b56..b74b946098 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -620,14 +620,14 @@ load_uri_auth_cb (EBook *book, EBookStatus status, gpointer closure)
static void
load_uri_cb (EBook *book, EBookStatus status, gpointer closure)
{
- AddressbookSource *source;
LoadUriData *load_uri_data = closure;
- source = addressbook_storage_get_source_by_uri (e_book_get_uri (book));
+ if (status == E_BOOK_STATUS_SUCCESS && book != NULL) {
+ AddressbookSource *source;
- if (status == E_BOOK_STATUS_SUCCESS) {
/* check if the addressbook needs authentication */
+ source = addressbook_storage_get_source_by_uri (e_book_get_uri (book));
if (source &&
source->auth != ADDRESSBOOK_LDAP_AUTH_NONE) {
const char *password;