summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2016-05-31 17:04:03 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2016-06-01 12:00:12 +0200
commit70d194c159c80266140157db535700f8e44dbe0b (patch)
tree29c0ebc77ee3b3e6865db83697fa66a80def52db /src
parent30f53e7e22628fb04d80dec978123b9b3653b89d (diff)
downloadNetworkManager-70d194c159c80266140157db535700f8e44dbe0b.tar.gz
core: fix some memory leaks
(cherry picked from commit ec53ed2cbaab754ddf1283658b5adfba8134e757)
Diffstat (limited to 'src')
-rw-r--r--src/dhcp-manager/nm-dhcp-client.c2
-rw-r--r--src/nm-manager.c2
-rw-r--r--src/nm-policy.c1
3 files changed, 4 insertions, 1 deletions
diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index 9f4cdf3e1f..c102581733 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -884,7 +884,9 @@ dispose (GObject *object)
g_clear_pointer (&priv->iface, g_free);
g_clear_pointer (&priv->hostname, g_free);
+ g_clear_pointer (&priv->fqdn, g_free);
g_clear_pointer (&priv->uuid, g_free);
+ g_clear_pointer (&priv->client_id, g_bytes_unref);
if (priv->hwaddr) {
g_byte_array_free (priv->hwaddr, TRUE);
diff --git a/src/nm-manager.c b/src/nm-manager.c
index f2eab5a44a..b4e832dfb0 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -3285,7 +3285,7 @@ validate_activation_request (NMManager *self,
NM_MANAGER_ERROR,
NM_MANAGER_ERROR_CONNECTION_NOT_AVAILABLE,
"Sharing IPv6 connections is not supported yet.");
- return NULL;
+ goto error;
}
/* Check whether it's a VPN or not */
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 7af311270d..9695ad605c 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -915,6 +915,7 @@ block_autoconnect_for_device (NMPolicy *self, NMDevice *device)
NM_DEVICE_STATE_REASON_USER_REQUESTED);
}
}
+ g_slist_free (connections);
}
static void