summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalint Reczey <balint.reczey@canonical.com>2020-04-22 09:51:53 +0200
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2020-06-23 14:50:50 +0200
commite607286e070675498fcd5a7ab73bc3da533f9eea (patch)
tree2188bf66ffd9c9586d3051d09afefba838fb286e
parent63b5df7c9fda4f7d44674076da5fc5cef4564f3a (diff)
downloadsystemd-e607286e070675498fcd5a7ab73bc3da533f9eea.tar.gz
shared: Don't try calling NULL callback in bus_wait_for_units_clear
BugLink: https://bugs.launchpad.net/bugs/1870930 (cherry picked from commit 9f656373082cb13542b877b4f5cb917ef5ff329c) Related: #1830861
-rw-r--r--src/shared/bus-wait-for-units.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/bus-wait-for-units.c b/src/shared/bus-wait-for-units.c
index de15da1620..63ba3fd422 100644
--- a/src/shared/bus-wait-for-units.c
+++ b/src/shared/bus-wait-for-units.c
@@ -91,7 +91,8 @@ static void bus_wait_for_units_clear(BusWaitForUnits *d) {
while ((item = hashmap_first(d->items))) {
d->current = item;
- item->unit_callback(d, item->bus_path, false, item->userdata);
+ if (item->unit_callback)
+ item->unit_callback(d, item->bus_path, false, item->userdata);
wait_for_item_free(item);
}