From 79127634e51429ef446a0809a69a524c1069d2c3 Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Fri, 18 Mar 2016 10:46:16 +0100 Subject: [PATCH] dhcp: fix GBytes leak in nm_dhcp_client_start_ip4() (cherry picked from commit 99ad9df34262a7eafac1127c2e47952b9f5c45dd) --- src/dhcp-manager/nm-dhcp-client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 7f5d5a28cd..d27c265590 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); @@ -424,7 +425,9 @@ nm_dhcp_client_start_ip4 (NMDhcpClient *self, nm_log_info (LOGD_DHCP, "Activation (%s) Beginning DHCPv4 transaction (timeout in %d seconds)", priv->iface, 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);