From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 2 Aug 2024 02:20:43 +0000 (+0900)
Subject: sd-device-monitor: make device_monitor_receive_device() always initialize ret on... 
X-Git-Tag: v257-rc1~772^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3fa16131ef591fe7d3232d7ba410f359d9fead2;p=thirdparty%2Fsystemd.git

sd-device-monitor: make device_monitor_receive_device() always initialize ret on success
---

diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c
index 474b1b603d7..50d4d577738 100644
--- a/src/libsystemd/sd-device/device-monitor.c
+++ b/src/libsystemd/sd-device/device-monitor.c
@@ -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;