From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 15 Nov 2018 09:46:23 +0000 (+0900)
Subject: udev-rules: fix possible assertion
X-Git-Tag: v240~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6da77b71bd3a86f4b24d535b58f57ba83f5669d;p=thirdparty%2Fsystemd.git

udev-rules: fix possible assertion

On 'remove' action, event->dev_db_clone is NULL. So, `IMPORT{db}` rule
on 'remove' action triggers assertion. This fixes the issue.
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index dcde65c8ef3..c52f93af1cc 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2043,7 +2043,8 @@ int udev_rules_apply_to_event(
                         const char *key;
 
                         key = rules_str(rules, cur->key.value_off);
-                        if (sd_device_get_property_value(event->dev_db_clone, key, &val) >= 0)
+                        if (event->dev_db_clone &&
+                            sd_device_get_property_value(event->dev_db_clone, key, &val) >= 0)
                                 device_add_property(dev, key, val);
                         else if (cur->key.op != OP_NOMATCH)
                                 goto nomatch;