fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 07:58:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: fix leak in dhclient's dhclient_start()

Browse source 
Fixes: 5d6d5cd136
(cherry picked from commit c87faf07a1)
(cherry picked from commit 8f9240de96)
(cherry picked from commit c740726b57)
(cherry picked from commit 0a69572cae)
(cherry picked from commit 13aaad7c5b)
(cherry picked from commit d95e1304e7)
This commit is contained in:
Thomas Haller 2018-09-10 14:31:23 +02:00
parent 55d749f940
commit b4b6089218
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dhcp-manager/nm-dhcp-dhclient.c
View file

@ -358,11 +358,15 @@ dhclient_start (NMDhcpClient *client,
if (g_file_copy (src, dst, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error)) { if (g_file_copy (src, dst, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error)) {
/* Success; use the preferred leasefile path */ /* Success; use the preferred leasefile path */
g_free (priv->lease_file); g_free (priv->lease_file);
priv->lease_file = g_strdup (g_file_get_path (dst)); priv->lease_file = g_file_get_path (dst);
} else { } else {
gs_free char *s_path = NULL;
gs_free char *d_path = NULL;
/* Failure; just use the existing leasefile */ /* Failure; just use the existing leasefile */
_LOGW ("failed to copy leasefile %s to %s: %s", _LOGW ("failed to copy leasefile %s to %s: %s",
g_file_get_path (src), g_file_get_path (dst), (s_path = g_file_get_path (src)),
(d_path = g_file_get_path (dst)),
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} }