From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 25 Oct 2022 19:52:06 +0000 (+0900)
Subject: udev: use ASSERT_PTR() at one more place
X-Git-Tag: v253-rc1~638^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F25136%2Fhead;p=thirdparty%2Fsystemd.git

udev: use ASSERT_PTR() at one more place
---

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 42b480ca6b1..454139c8820 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -1038,11 +1038,9 @@ int udev_event_execute_rules(
         sd_device *dev;
         int r;
 
-        assert(event);
+        dev = ASSERT_PTR(ASSERT_PTR(event)->dev);
         assert(rules);
 
-        dev = event->dev;
-
         r = sd_device_get_action(dev, &action);
         if (r < 0)
                 return log_device_error_errno(dev, r, "Failed to get ACTION: %m");
@@ -1051,7 +1049,7 @@ int udev_event_execute_rules(
                 return event_execute_rules_on_remove(event, inotify_fd, timeout_usec, timeout_signal, properties_list, rules);
 
         /* Disable watch during event processing. */
-        r = udev_watch_end(inotify_fd, event->dev);
+        r = udev_watch_end(inotify_fd, dev);
         if (r < 0)
                 log_device_warning_errno(dev, r, "Failed to remove inotify watch, ignoring: %m");