picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

test-network: fix segfault with NULL dev_path/driver/type/name

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-02-16 13:56:31 -05:00
parent 8c340239a6
commit d49dc81276
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libsystemd-network/network-internal.c
View file

@ -112,16 +112,20 @@ bool net_match_config(const struct ether_addr *match_mac,
if (match_mac && (!dev_mac || memcmp(match_mac, dev_mac, ETH_ALEN)))
return false;
if (!strv_fnmatch_or_empty(dev_path, match_paths, 0))
if (!strv_isempty(match_paths) &&
(!dev_path || !strv_fnmatch(dev_path, match_paths, 0)))
return false;
if (!strv_fnmatch_or_empty(dev_driver, match_drivers, 0))
if (!strv_isempty(match_drivers) &&
(!dev_driver || !strv_fnmatch(dev_driver, match_drivers, 0)))
return false;
if (!strv_fnmatch_or_empty(dev_type, match_types, 0))
if (!strv_isempty(match_types) &&
(!dev_type || !strv_fnmatch_or_empty(dev_type, match_types, 0)))
return false;
if (!strv_fnmatch_or_empty(dev_name, match_names, 0))
if (!strv_isempty(match_names) &&
(!dev_name || !strv_fnmatch_or_empty(dev_name, match_names, 0)))
return false;
return true;