chiark / gitweb /
libudev: enumerate - do not try to match against an empty subsystem
authorKay Sievers <kay@vrfy.org>
Wed, 4 Sep 2013 15:59:14 +0000 (17:59 +0200)
committerKay Sievers <kay@vrfy.org>
Wed, 4 Sep 2013 15:59:14 +0000 (17:59 +0200)
src/libudev/libudev-enumerate.c

index 385829d..bc1e37d 100644 (file)
@@ -721,12 +721,14 @@ static bool match_subsystem(struct udev_enumerate *udev_enumerate, const char *s
 {
         struct udev_list_entry *list_entry;
 
-        subsystem = subsystem ? : "";
+        if (!subsystem)
+                return false;
 
         udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->subsystem_nomatch_list)) {
                 if (fnmatch(udev_list_entry_get_name(list_entry), subsystem, 0) == 0)
                         return false;
         }
+
         if (udev_list_get_entry(&udev_enumerate->subsystem_match_list) != NULL) {
                 udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->subsystem_match_list)) {
                         if (fnmatch(udev_list_entry_get_name(list_entry), subsystem, 0) == 0)
@@ -734,6 +736,7 @@ static bool match_subsystem(struct udev_enumerate *udev_enumerate, const char *s
                 }
                 return false;
         }
+
         return true;
 }