** See bug #311440.

2005-07-28  Not Zed  <NotZed@Ximian.com>

        ** See bug #311440.

        * em-utils.c (em_utils_in_addressbook): handle NULL address.

svn path=/trunk/; revision=29920

mail/ChangeLog

@@ -1,14 +1,18 @@
+2005-07-28  Not Zed  <NotZed@Ximian.com>
+
+	** See bug #311440.
+
+	* em-utils.c (em_utils_in_addressbook): handle NULL address.
+
 2005-07-28  Praveen Kumar <kpraveen@novell.com>
 
 	* em-account-editor.c (emae_check_complete) : Update the "Full Name" 
 	text entry with the detected real name of the user. Fixes bug 311778
 	
-
 2005-07-27  Srinivasa Ragavan <sragavan@novell.com>
 	
 	* mail-config.glade: Changed "Host" to "Server"
 
-
 2005-07-27  Not Zed  <NotZed@Ximian.com>
 
 	* mail-send-recv.c (get_folders): hack to make it honour the

mail/em-utils.c

@@ -1871,7 +1871,8 @@ em_utils_in_addressbook(CamelInternetAddress *iaddr)
 	time_t now;
 
 	/* TODO: check all addresses? */
-	if (!camel_internet_address_get(iaddr, 0, NULL, &addr))
+	if (iaddr == NULL
+	    || !camel_internet_address_get(iaddr, 0, NULL, &addr))
 		return FALSE;
 
 	pthread_mutex_lock(&emu_addr_lock);