From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 5 Mar 2019 01:31:20 +0000 (+0900)
Subject: udev: do not read UdevEvent object before checking it is non-NULL
X-Git-Tag: v242-rc1~198^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d0fdf45136e459208591142aa1a843b94af1e36;p=thirdparty%2Fsystemd.git

udev: do not read UdevEvent object before checking it is non-NULL
---

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index b37411889f6..a1246014199 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -821,13 +821,15 @@ int udev_event_execute_rules(UdevEvent *event,
                              usec_t timeout_usec,
                              Hashmap *properties_list,
                              UdevRules *rules) {
-        sd_device *dev = event->dev;
         const char *subsystem, *action;
+        sd_device *dev;
         int r;
 
         assert(event);
         assert(rules);
 
+        dev = event->dev;
+
         r = sd_device_get_subsystem(dev, &subsystem);
         if (r < 0)
                 return log_device_error_errno(dev, r, "Failed to get subsystem: %m");