clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-03 20:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd-bus: create clean error when a property Set() call with incorrect signature is passed in

Browse Source 
(cherry picked from commit 0ca454d474)
This commit is contained in:
Lennart Poettering
2015-01-16 00:56:50 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent f1bf35a835
commit 326f2a7395
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/bus-objects.c
+10
View File
@@ -617,6 +617,9 @@ static int property_get_set_callbacks_run(
return r;
} else {
const char *signature = NULL;
char type = 0;
if (c->vtable->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY)
return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Property '%s' is not writable.", c->member);
@@ -628,6 +631,13 @@ static int property_get_set_callbacks_run(
c->last_iteration = bus->iteration_counter;
r = sd_bus_message_peek_type(m, &type, &signature);
if (r < 0)
return r;
if (type != 'v' || !streq(strempty(signature), strempty(c->vtable->x.property.signature)))
return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Incorrect parameters for property '%s', expected '%s', got '%s'.", c->member, strempty(c->vtable->x.property.signature), strempty(signature));
r = sd_bus_message_enter_container(m, 'v', c->vtable->x.property.signature);
if (r < 0)
return r;