free CamelURL and exchange_params. Fixes #324483.

svn path=/trunk/; revision=30878

2 files changed, 15 insertions, 1 deletions

diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 7dd5d7ae18..b8cd722394 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,5 +1,13 @@
 2005-12-19  Sushma Rai  <rsushma@novell.com>
 
+	* exchange-account-setup.c (org_gnome_exchange_settings)
+	(owa_editor_entry_changed)(org_gnome_exchange_owa_url)
+	(org_gnome_exchange_commit): free CamelURL.
+	(owa_authenticate_user): free CamelURL and exchange_params.
+	Fixes #324483.
+
+2005-12-19  Sushma Rai  <rsushma@novell.com>
+
 	* exchange-folder-permission.c: Corrected include path of header files
 	which was breaking the build.
 	
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index c4f5bc3ed8..383d5f6b13 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -221,6 +221,8 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 		camel_url_free(url);
 		return data->old;
 	}
+	if (url)
+		camel_url_free (url);
 
 	account = exchange_operations_get_exchange_account ();
 
@@ -443,7 +445,6 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	exchange_params->owa_path = NULL;
 	exchange_params->is_ntlm = TRUE;
 
-
 	source_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL);
 
 	url = camel_url_new(source_url, NULL);
@@ -485,6 +486,8 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 
 	g_free (exchange_params->owa_path);
 	g_free (exchange_params->mailbox);
+	g_free (exchange_params->host);
+	g_free (exchange_params->ad_server);
 	g_free (exchange_params);
 
 	if (valid) {	
@@ -532,6 +535,7 @@ owa_editor_entry_changed(GtkWidget *entry, EConfig *config)
 	url_string = camel_url_to_string(url, 0);
 	e_account_set_string(target->account, E_ACCOUNT_SOURCE_URL, url_string);
 	g_free(url_string);
+	camel_url_free (url);
 }
 
 static char *
@@ -631,6 +635,7 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 			g_free(uri);
 		}
 	}
+	camel_url_free (url);	
 	if (owa_url)
 		gtk_entry_set_text(GTK_ENTRY (owa_entry), owa_url); 
 	gtk_label_set_mnemonic_widget((GtkLabel *)label, owa_entry);
@@ -730,6 +735,7 @@ org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 		return;
 	}
 
+	camel_url_free (url);
 	/* Set oof data in exchange account */
 	set_oof_info ();
 	destroy_oof_data ();