evolution-data-server r9692 - in branches/gnome-2-24/servers/exchange: . storage

[abharath svn gnome org]

Author: abharath
Date: Sun Oct 19 16:44:27 2008
New Revision: 9692
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9692&view=rev

Log:
2008-10-19  Milan Crha  <mcrha redhat com>

        ** Fix for bug #544141

         * storage/exchange-account.c: (set_sf_prop): Do not store invalid
           values in 'standard_uris', it leads to crash later.


Modified:
   branches/gnome-2-24/servers/exchange/ChangeLog
   branches/gnome-2-24/servers/exchange/storage/exchange-account.c

Modified: branches/gnome-2-24/servers/exchange/storage/exchange-account.c
==============================================================================
--- branches/gnome-2-24/servers/exchange/storage/exchange-account.c	(original)
+++ branches/gnome-2-24/servers/exchange/storage/exchange-account.c	Sun Oct 19 16:44:27 2008
@@ -872,17 +872,25 @@
 
 static void
 set_sf_prop (const char *propname, E2kPropType type,
-	     gpointer href, gpointer user_data)
+	     gpointer phref, gpointer user_data)
 {
 	ExchangeAccount *account = user_data;
+	const char *href = (const char *)phref;
+	char *tmp;
 
 	propname = strrchr (propname, ':');
-	if (!propname++)
+	if (!propname++ || !href || !*href)
 		return;
 
+	tmp = e2k_strdup_with_trailing_slash (href);
+	if (!tmp) {
+		g_warning ("Failed to add propname '%s' for href '%s'\n", propname, href);
+		return;
+	}
+
 	g_hash_table_insert (account->priv->standard_uris,
 			     g_strdup (propname),
-			     e2k_strdup_with_trailing_slash (href));
+			     tmp);
 }
 
 static const char *mailbox_info_props[] = {