summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-07-15 14:35:15 +0200
committerSven Eden <yamakuzure@gmx.net>2017-03-14 10:06:19 +0100
commit6fec834165df2fd841e1132d60d5228db0d1c494 (patch)
treead325a71d933c7859a1ef0c83f994d7a918ee164 /src
parentf6035a5ec8045bf007c7ebc5ee5306418644e7aa (diff)
sd-bus: fix object tree to be deeper than 2 levels
So right now our object-tree is limited to 2 levels at most ('/' and '/foo/...../bar'). We never link any intermediate levels, even though that was clearly the plan. Fix the bus_node_allocate() helper to actually link all intermediate nodes, too, not just the root node. This fixes a simple inverse ptr-diff bug. The downside of this fix is that we clearly never tested (nor used) the object tree in any way. The only reason that the introspection works is that our enumerators shortcut the object tree. Lets see whether that code actually works.. Thanks to: Nathaniel McCallum <nathaniel@themccallums.org> ..for reporting this. See #524 for an actual example code.
Diffstat (limited to 'src')
-rw-r--r--src/libelogind/sd-bus/bus-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libelogind/sd-bus/bus-objects.c b/src/libelogind/sd-bus/bus-objects.c
index b3cc28ee9..cbdf6552f 100644
--- a/src/libelogind/sd-bus/bus-objects.c
+++ b/src/libelogind/sd-bus/bus-objects.c
@@ -1416,7 +1416,7 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) {
e = strrchr(path, '/');
assert(e);
- p = strndupa(path, MAX(1, path - e));
+ p = strndupa(path, MAX(1, e - path));
parent = bus_node_allocate(bus, p);
if (!parent)