picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6853 from sourcejedi/GetAll

Browse source 
sd-bus: fix response for GetAll on non-existent objects
This commit is contained in:
Lennart Poettering 2017-09-21 21:41:55 +02:00 committed by GitHub
parent a4041e4f68 00590f8268
commit d82611c918
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libsystemd/sd-bus/bus-objects.c
View file

@ -38,7 +38,7 @@ static int node_vtable_get_userdata(
sd_bus_error *error) {
sd_bus_slot *s;
void *u;
void *u, *found_u;
int r;
assert(bus);
@ -50,7 +50,7 @@ static int node_vtable_get_userdata(
if (c->find) {
bus->current_slot = sd_bus_slot_ref(s);
bus->current_userdata = u;
r = c->find(bus, path, c->interface, u, &u, error);
r = c->find(bus, path, c->interface, u, &found_u, error);
bus->current_userdata = NULL;
bus->current_slot = sd_bus_slot_unref(s);
@ -60,10 +60,11 @@ static int node_vtable_get_userdata(
return -sd_bus_error_get_errno(error);
if (r == 0)
return r;
}
} else
found_u = u;
if (userdata)
*userdata = u;
*userdata = found_u;
return 1;
}
@ -829,6 +830,9 @@ static int property_get_all_callbacks_run(
return 0;
}
if (!*found_object)
return 0;
if (!found_interface) {
r = sd_bus_reply_method_errorf(
m,