]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-device-monitor: make device_monitor_receive_device() always initialize ret on...
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 2 Aug 2024 02:20:43 +0000 (11:20 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 2 Aug 2024 02:22:07 +0000 (11:22 +0900)
src/libsystemd/sd-device/device-monitor.c

index 474b1b603d70c9dc8ab119ec7692f7c7965cb1e6..50d4d577738cc273fd6a6094113f20eebb1d712d 100644 (file)
@@ -661,9 +661,10 @@ int device_monitor_receive_device(sd_device_monitor *m, sd_device **ret) {
         r = passes_filter(m, device);
         if (r < 0)
                 return log_device_monitor_errno(device, m, r, "Failed to check received device passing filter: %m");
-        if (r == 0)
+        if (r == 0) {
                 log_device_monitor(device, m, "Received device does not pass filter, ignoring.");
-        else
+                *ret = NULL;
+        } else
                 *ret = TAKE_PTR(device);
 
         return r;