From 2fb731aa4344fac0abba0d3296a5117fb92eceb2 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Tue, 28 Feb 2006 19:48:25 +0000 Subject: [PATCH] 2006-02-28 Robert Love * libnm-util/dbus-helpers.c, src/nm-ap-security-wpa-eap.c, src/nm-ap-security-wpa-psk.c, gnome/applet/nm-gconf-wso-wpa-eap.c, gnome/applet/nm-gconf-wso-wpa-eap.c: Fix FIXMEs: Callers of the DBUS deserializers are responsible for freeing the returned DBUS strings. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1515 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 3 ++- gnome/applet/nm-gconf-wso-wpa-eap.c | 16 ++++++++++++++-- gnome/applet/nm-gconf-wso-wpa-psk.c | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c92ad7bfe1..a843dc4bb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ 2006-02-28 Robert Love * libnm-util/dbus-helpers.c, src/nm-ap-security-wpa-eap.c, - src/nm-ap-security-wpa-psk.c: Fix FIXMEs: Callers of the DBUS + src/nm-ap-security-wpa-psk.c, gnome/applet/nm-gconf-wso-wpa-eap.c, + gnome/applet/nm-gconf-wso-wpa-eap.c: Fix FIXMEs: Callers of the DBUS deserializers are responsible for freeing the returned DBUS strings. 2006-02-27 Christopher Aillon diff --git a/gnome/applet/nm-gconf-wso-wpa-eap.c b/gnome/applet/nm-gconf-wso-wpa-eap.c index f01f7d8cf0..4c0ef532c4 100644 --- a/gnome/applet/nm-gconf-wso-wpa-eap.c +++ b/gnome/applet/nm-gconf-wso-wpa-eap.c @@ -87,7 +87,13 @@ nm_gconf_wso_wpa_eap_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher) security->priv->client_cert_file = g_strdup (client_cert_file); security->priv->ca_cert_file = g_strdup (ca_cert_file); - /* FIXME: Need to free passwd, key_file, and cert_file ? */ + dbus_free (identity); + dbus_free (passwd); + dbus_free (anon_identity); + dbus_free (private_key_passwd); + dbus_free (private_key_file); + dbus_free (client_cert_file); + dbus_free (ca_cert_file); out: return security; @@ -196,7 +202,13 @@ nm_gconf_wso_wpa_eap_new_deserialize_gconf (GConfClient *client, const char *net security->priv->client_cert_file = g_strdup (client_cert_file); security->priv->ca_cert_file = g_strdup (ca_cert_file); - /* FIXME: Need to free key_file and cert_file ? */ + g_free (identity); + g_free (passwd); + g_free (anon_identity); + g_free (private_key_passwd); + g_free (private_key_file); + g_free (client_cert_file); + g_free (ca_cert_file); out: return security; diff --git a/gnome/applet/nm-gconf-wso-wpa-psk.c b/gnome/applet/nm-gconf-wso-wpa-psk.c index c9ce6a9690..96b5728a5c 100644 --- a/gnome/applet/nm-gconf-wso-wpa-psk.c +++ b/gnome/applet/nm-gconf-wso-wpa-psk.c @@ -63,7 +63,7 @@ nm_gconf_wso_wpa_psk_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher) security->priv->wpa_version = wpa_version; security->priv->key_mgt = key_mgt; - /* FIXME: Need to free 'key' ? */ + dbus_free (key); out: return security;