summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Giudici <fgiudici@redhat.com>2016-03-18 10:46:16 +0100
committerFrancesco Giudici <fgiudici@redhat.com>2016-03-18 10:46:16 +0100
commit99ad9df34262a7eafac1127c2e47952b9f5c45dd (patch)
tree9b636e5b945e8087783da68cc68f9674d0a10f25
parente3d2fc861b86bbde2bfa3987e3f89a414046219a (diff)
downloadNetworkManager-99ad9df34262a7eafac1127c2e47952b9f5c45dd.tar.gz
dhcp: fix GBytes leak in nm_dhcp_client_start_ip4()
-rw-r--r--src/dhcp-manager/nm-dhcp-client.c5
1 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 10c69049e0..b8161ab5d3 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -413,6 +413,7 @@ nm_dhcp_client_start_ip4 (NMDhcpClient *self,
const char *last_ip4_address)
{
NMDhcpClientPrivate *priv;
+ gs_unref_bytes GBytes *tmp = NULL;
g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE);
@@ -423,7 +424,9 @@ nm_dhcp_client_start_ip4 (NMDhcpClient *self,
_LOGI ("activation: beginning transaction (timeout in %d seconds)", priv->timeout);
- nm_dhcp_client_set_client_id (self, dhcp_client_id ? nm_dhcp_utils_client_id_string_to_bytes (dhcp_client_id) : NULL);
+ if (dhcp_client_id)
+ tmp = nm_dhcp_utils_client_id_string_to_bytes (dhcp_client_id);
+ nm_dhcp_client_set_client_id (self, tmp);
g_clear_pointer (&priv->hostname, g_free);
priv->hostname = g_strdup (hostname);