diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2014-10-22 15:48:58 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2014-10-23 09:15:58 +0200 |
| commit | 6354a0e450a4d7793a0f46048d5a852be2ae60f8 (patch) | |
| tree | d27a033dc6a0507b52024cd22c5e1de0a9cd43f9 | |
| parent | db95e213c71b027d4ab9340249242e5f47eefac2 (diff) | |
| download | NetworkManager-6354a0e450a4d7793a0f46048d5a852be2ae60f8.tar.gz | |
all: fix g_dbus_proxy_get_name_owner() leaks
| -rw-r--r-- | libnm/nm-object.c | 8 | ||||
| -rw-r--r-- | libnm/nm-secret-agent.c | 16 |
2 files changed, 19 insertions, 5 deletions
diff --git a/libnm/nm-object.c b/libnm/nm-object.c index 735881b227..db0e32170a 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -108,8 +108,10 @@ on_name_owner_changed (GObject *proxy, NMObject *self = NM_OBJECT (user_data); NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (self); gboolean now_running; + char *owner; - now_running = (g_dbus_proxy_get_name_owner (priv->properties_proxy) != NULL); + now_running = ((owner = g_dbus_proxy_get_name_owner (priv->properties_proxy)) != NULL); + g_free (owner); if (now_running != priv->nm_running) { priv->nm_running = now_running; g_object_notify (G_OBJECT (self), NM_OBJECT_NM_RUNNING); @@ -128,11 +130,13 @@ static void init_dbus (NMObject *object) { NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object); + char *owner; if (_nm_dbus_is_connection_private (priv->connection)) priv->nm_running = TRUE; else { - priv->nm_running = (g_dbus_proxy_get_name_owner (priv->properties_proxy) != NULL); + priv->nm_running = ((owner = g_dbus_proxy_get_name_owner (priv->properties_proxy)) != NULL); + g_free (owner); g_signal_connect (priv->properties_proxy, "notify::g-name-owner", G_CALLBACK (on_name_owner_changed), object); } diff --git a/libnm/nm-secret-agent.c b/libnm/nm-secret-agent.c index 93555c4151..2dfde7a093 100644 --- a/libnm/nm-secret-agent.c +++ b/libnm/nm-secret-agent.c @@ -124,10 +124,13 @@ name_owner_changed (GObject *proxy, NMSecretAgent *self = NM_SECRET_AGENT (user_data); NMSecretAgentPrivate *priv = NM_SECRET_AGENT_GET_PRIVATE (self); GSList *iter; + char *owner; - if (g_dbus_proxy_get_name_owner (G_DBUS_PROXY (proxy)) != NULL) { + owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (proxy)); + if (owner != NULL) { if (should_auto_register (self)) nm_secret_agent_register_async (self, NULL, NULL, NULL); + g_free (owner); } else { /* Cancel any pending secrets requests */ for (iter = priv->pending_gets; iter; iter = g_slist_next (iter)) { @@ -150,7 +153,7 @@ verify_sender (NMSecretAgent *self, GError **error) { NMSecretAgentPrivate *priv = NM_SECRET_AGENT_GET_PRIVATE (self); - const char *nm_owner; + char *nm_owner; const char *sender; guint32 sender_uid; GVariant *ret; @@ -181,6 +184,7 @@ verify_sender (NMSecretAgent *self, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_PERMISSION_DENIED, "Failed to get request sender."); + g_free (nm_owner); return FALSE; } @@ -190,8 +194,10 @@ verify_sender (NMSecretAgent *self, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_PERMISSION_DENIED, "Request sender does not match NetworkManager bus name owner."); + g_free (nm_owner); return FALSE; } + g_free (nm_owner); /* If we're connected to the session bus, then this must be a test program, * so skip the UID check. @@ -470,11 +476,15 @@ static gboolean check_nm_running (NMSecretAgent *self, GError **error) { NMSecretAgentPrivate *priv = NM_SECRET_AGENT_GET_PRIVATE (self); + char *owner; if (priv->private_bus) return TRUE; - if (g_dbus_proxy_get_name_owner (G_DBUS_PROXY (priv->manager_proxy))) + owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (priv->manager_proxy)); + if (owner) { + g_free (owner); return TRUE; + } g_set_error (error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED, "NetworkManager is not running"); |