fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 11:50:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: avoid copy of value for "HWADDR_BLACKLIST"

Browse source
This commit is contained in:
Thomas Haller 2017-11-29 16:15:17 +01:00
parent de92e88161
commit d3520813e8
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -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);
}