nwfilterDriverRemoveDBusMatches: Prevent unsubscribing from null id

Allow nwfilterDriverRemoveDBusMatches to be called without
nwfilterDriverInstallDBusMatches being called previously.

This enables a later patch to use nwfilterDriverRemoveDBusMatches
as a cleanup function safely.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-04-08 13:42:30 +02:00
parent 879ecd602f
commit 008162e12a

View File

@ -77,12 +77,19 @@ static unsigned int reloadID;
static void static void
nwfilterDriverRemoveDBusMatches(void) nwfilterDriverRemoveDBusMatches(void)
{ {
GDBusConnection *sysbus; GDBusConnection *sysbus = virGDBusGetSystemBus();
sysbus = virGDBusGetSystemBus(); if (!sysbus)
if (sysbus) { return;
if (restartID != 0) {
g_dbus_connection_signal_unsubscribe(sysbus, restartID); g_dbus_connection_signal_unsubscribe(sysbus, restartID);
restartID = 0;
}
if (reloadID != 0) {
g_dbus_connection_signal_unsubscribe(sysbus, reloadID); g_dbus_connection_signal_unsubscribe(sysbus, reloadID);
reloadID = 0;
} }
} }