From 0eac08a5cfa2771ad740e6e432c32daaf28b0bdc Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Wed, 29 Oct 2014 17:58:43 +0100

Subject: [PATCH] sd-bus: properly handle removals of non-existing matches

(cherry picked from commit ef7b6c0190fefaacf6d8f8e1a6dda4ba8b98091b)

---

 src/libsystemd/sd-bus/bus-match.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c

index 18afe0f12a..5658c61ba7 100644

--- a/src/libsystemd/sd-bus/bus-match.c

+++ b/src/libsystemd/sd-bus/bus-match.c

@@ -537,7 +537,7 @@ static int bus_match_find_compare_value(

         else if (BUS_MATCH_CAN_HASH(t))

                 n = hashmap_get(c->compare.children, value_str);

         else {

-                for (n = c->child; !value_node_same(n, t, value_u8, value_str); n = n->next)

+                for (n = c->child; n && !value_node_same(n, t, value_u8, value_str); n = n->next)

                         ;

         }