From d9fba533169b271d0e803016fea86fb57bc3f5ca Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 28 Nov 2014 19:16:25 +0100 Subject: [PATCH] sd-bus: if a NULL signatures is passed to sd_bus_message_skip(), make it skip a single element of any type --- src/libsystemd/sd-bus/bus-message.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index a4939b47c..9fdf0d7e8 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -4450,13 +4450,32 @@ _public_ int sd_bus_message_skip(sd_bus_message *m, const char *types) { assert_return(m, -EINVAL); assert_return(m->sealed, -EPERM); - assert_return(types, -EINVAL); - if (isempty(types)) - return 0; + /* If types is NULL, read exactly one element */ + if (!types) { + struct bus_container *c; + size_t l; + + if (message_end_of_signature(m)) + return -ENXIO; + + if (message_end_of_array(m, m->rindex)) + return 0; + + c = message_get_container(m); + + r = signature_element_length(c->signature + c->index, &l); + if (r < 0) + return r; + + types = strndupa(c->signature + c->index, l); + } switch (*types) { + case 0: /* Nothing to drop */ + return 0; + case SD_BUS_TYPE_BYTE: case SD_BUS_TYPE_BOOLEAN: case SD_BUS_TYPE_INT16: -- 2.30.2