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

[elogind.git] / src / libsystemd-network / network-internal.c

diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index 5867aef662c90e5c579c544816465c7e1aea287a..81f90aa3893cd842d075256b6ef542f2db261aac 100644 (file)
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -112,17 +112,21 @@ 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_isempty(match_paths))
-                return strv_fnmatch(dev_path, match_paths, 0);
+        if (!strv_isempty(match_paths) &&
+            (!dev_path || !strv_fnmatch(dev_path, match_paths, 0)))
+                return false;
 
-        if (!strv_isempty(match_drivers))
-                return strv_fnmatch(dev_driver, match_drivers, 0);
+        if (!strv_isempty(match_drivers) &&
+            (!dev_driver || !strv_fnmatch(dev_driver, match_drivers, 0)))
+                return false;
 
-        if (!strv_isempty(match_types))
-                return strv_fnmatch(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_isempty(match_names))
-                return strv_fnmatch(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;
 }