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>

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 1f7d40e1b0587eea9f0bd54b718e9bd7b9b93622..f89b5b87574150c4bb63d2586c771cfb30602bb2 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -77,12 +77,19 @@ static unsigned int reloadID;
 static 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);
+        restartID = 0;
+    }
+
+    if (reloadID != 0) {
         g_dbus_connection_signal_unsubscribe(sysbus, reloadID);
+        reloadID = 0;
     }
 }