NetworkManager/0001-ifcfg-fix-crash-parsin...

41 lines
1.2 KiB
Diff

From 7759db451bbc4bfd1fd0022e2ec60514f123f844 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 19 Oct 2018 18:01:07 +0200
Subject: [PATCH] ifcfg: fix crash parsing more than 10 DNS settings in
make_ip6_setting()
On master, commit [1] added a double-free error. This was
unintentionally fixed later in commit [2].
Commit [1] was backported to nm-1-10 branch in 1.10.10.
Fix it.
[1] a9b507932465888504cbf93bcf3a86b1c3b1df79, 1.11.2-dev
[2] e9321713a90a2f1098afbdbbfbb462638c54a368, 1.12-rc1
https://bugzilla.redhat.com/show_bug.cgi?id=1607866
Fixes: b2a9e2f326d850eeb2cea03ce2a07358bc1f6b70
(cherry picked from commit cca492af146c43a617582a968285957b93165a4b)
---
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index c91cd2538..13ef5d2b7 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -1933,7 +1933,7 @@ make_ip6_setting (shvarFile *ifcfg,
goto error;
}
- g_free (value);
+ nm_clear_g_free (&value);
}
if (!routes_read) {
--
2.17.1