From d3520813e841269b839b3a6ffef52d018ac95db4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 29 Nov 2017 16:15:17 +0100 Subject: [PATCH] ifcfg-rh: avoid copy of value for "HWADDR_BLACKLIST" --- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 50d0bc723a..4862809883 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -3635,13 +3635,12 @@ make_wireless_setting (shvarFile *ifcfg, g_object_set (s_wireless, NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK, value, NULL); g_free (value); - value = svGetValueStr_cp (ifcfg, "HWADDR_BLACKLIST"); - if (value) { - char **strv; + cvalue = svGetValueStr (ifcfg, "HWADDR_BLACKLIST", &value); + if (cvalue) { + gs_strfreev char **strv = NULL; - strv = transform_hwaddr_blacklist (value); + strv = transform_hwaddr_blacklist (cvalue); g_object_set (s_wireless, NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, strv, NULL); - g_strfreev (strv); g_free (value); } @@ -4101,6 +4100,7 @@ make_wired_setting (shvarFile *ifcfg, GError **error) { gs_unref_object NMSettingWired *s_wired = NULL; + const char *cvalue; gs_free char *value = NULL; char *nettype; @@ -4209,11 +4209,11 @@ make_wired_setting (shvarFile *ifcfg, NULL); nm_clear_g_free (&value); - value = svGetValueStr_cp (ifcfg, "HWADDR_BLACKLIST"); - if (value) { + cvalue = svGetValueStr (ifcfg, "HWADDR_BLACKLIST", &value); + if (cvalue) { gs_strfreev char **strv = NULL; - strv = transform_hwaddr_blacklist (value); + strv = transform_hwaddr_blacklist (cvalue); g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, strv, NULL); nm_clear_g_free (&value); }