From 74d44dd56347d0e13faacb4a07d33b315593ef85 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 8 Feb 2015 10:04:06 +0100 Subject: [PATCH] config: fix memleak in read_config() (cherry picked from commit b49fdae59eb443632503ed6dc589df27cd2de0c1) Conflicts: src/nm-config.c --- src/nm-config.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nm-config.c b/src/nm-config.c index fa9a894429..d072fe0a8d 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -407,8 +407,8 @@ read_config (NMConfig *config, const char *path, GError **error) if (keys[k][len - 1] == '+') { char *base_key = g_strndup (keys[k], len - 1); - const char *old_val = g_key_file_get_value (priv->keyfile, groups[g], base_key, NULL); - const char *new_val = g_key_file_get_value (kf, groups[g], keys[k], NULL); + char *old_val = g_key_file_get_value (priv->keyfile, groups[g], base_key, NULL); + char *new_val = g_key_file_get_value (kf, groups[g], keys[k], NULL); if (old_val && *old_val) { char *combined = g_strconcat (old_val, ",", new_val, NULL); @@ -419,6 +419,8 @@ read_config (NMConfig *config, const char *path, GError **error) g_key_file_set_value (priv->keyfile, groups[g], base_key, new_val); g_free (base_key); + g_free (old_val); + g_free (new_val); continue; }