From 1eaf7b92ab45908814963679b0a4698151d46ec8 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.reczey@canonical.com>
Date: Dec 15 2020 17:55:21 +0000
Subject: 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

patch_name: 0422-shared-Don-t-try-calling-NULL-callback-in-bus_wait_f.patch
present_in_specfile: true
location_in_specfile: 422
squash_commits: true

---

diff --git a/src/shared/bus-wait-for-units.c b/src/shared/bus-wait-for-units.c
index de15da1..63ba3fd 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);
         }