Magellan Linux

Contents of /trunk/systemd/patches/systemd-217-sd-bus-properly-handle-removals-of-non-existing-matc.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2524 - (show annotations) (download)
Mon Nov 17 13:56:31 2014 UTC (9 years, 5 months ago) by niro
File size: 949 byte(s)
-upstream fixes
1 From ef7b6c0190fefaacf6d8f8e1a6dda4ba8b98091b Mon Sep 17 00:00:00 2001
2 From: Lennart Poettering <lennart@poettering.net>
3 Date: Wed, 29 Oct 2014 17:58:43 +0100
4 Subject: [PATCH] sd-bus: properly handle removals of non-existing matches
5
6 ---
7 src/libsystemd/sd-bus/bus-match.c | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10 diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
11 index 18afe0f..5658c61 100644
12 --- a/src/libsystemd/sd-bus/bus-match.c
13 +++ b/src/libsystemd/sd-bus/bus-match.c
14 @@ -537,7 +537,7 @@ static int bus_match_find_compare_value(
15 else if (BUS_MATCH_CAN_HASH(t))
16 n = hashmap_get(c->compare.children, value_str);
17 else {
18 - for (n = c->child; !value_node_same(n, t, value_u8, value_str); n = n->next)
19 + for (n = c->child; n && !value_node_same(n, t, value_u8, value_str); n = n->next)
20 ;
21 }
22
23 --
24 2.1.3
25