bus-driverd: do not track identical matches

Identical matches are only one time in the hash map but multiple
times in the list; when removing, the hash will be empty but the
list still has entries.

Not adding dupicates to the list should keep us in sync and prevent
hitting the assert.

diff --git a/src/bus-driverd/bus-driverd.c b/src/bus-driverd/bus-driverd.c
index 7e0ad1e0c05111235d12cf17b75fd74951e3873c..46a5b10974847b8384e95f4b9a7592cfa5686f95 100644 (file)
--- a/src/bus-driverd/bus-driverd.c
+++ b/src/bus-driverd/bus-driverd.c
@@ -130,7 +130,10 @@ static int match_new(Client *c, struct bus_match_component *components, unsigned
         first = hashmap_get(c->matches, m->match);
         LIST_PREPEND(matches, first, m);
         r = hashmap_replace(c->matches, m->match, first);
-        if (r < 0) {
+        if (r == 0) {
+                log_debug("Match '%s' already installed, ignoring request.", m->match);
+                LIST_REMOVE(matches, first, m);
+        } else if (r < 0) {
                 LIST_REMOVE(matches, first, m);
                 goto fail;
         }