From a6da77b71bd3a86f4b24d535b58f57ba83f5669d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 15 Nov 2018 18:46:23 +0900 Subject: [PATCH] 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. --- src/udev/udev-rules.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index dcde65c8ef30a..c52f93af1cccb 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;