sd-bus: fix marshaling of unary type

[elogind.git] / src / libelogind / sd-bus / bus-message.c

diff --git a/src/libelogind/sd-bus/bus-message.c b/src/libelogind/sd-bus/bus-message.c
index c38b2a5fa5cb6160a22becd3fedc4fdda3ff9898..c37a44493aaf1fcaf10bc383d8d140a3969ee2a9 100644 (file)
--- a/src/libelogind/sd-bus/bus-message.c
+++ b/src/libelogind/sd-bus/bus-message.c
@@ -803,7 +803,7 @@ _public_ int sd_bus_message_new_method_errorf(
                 const char *format,
                 ...) {
 
                 const char *format,
                 ...) {
 

-        _cleanup_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;

         va_list ap;
 
         assert_return(name, -EINVAL);
         va_list ap;
 
         assert_return(name, -EINVAL);


@@ -822,7 +822,7 @@ _public_ int sd_bus_message_new_method_errno(
                 int error,
                 const sd_bus_error *p) {
 
                 int error,
                 const sd_bus_error *p) {
 

-        _cleanup_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
+        _cleanup_bus_error_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;

 
         if (sd_bus_error_is_set(p))
                 return sd_bus_message_new_method_error(call, m, p);
 
         if (sd_bus_error_is_set(p))
                 return sd_bus_message_new_method_error(call, m, p);


@@ -839,7 +839,7 @@ _public_ int sd_bus_message_new_method_errnof(
                 const char *format,
                 ...) {
 
                 const char *format,
                 ...) {
 

-        _cleanup_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
+        _cleanup_bus_error_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;

         va_list ap;
 
         va_start(ap, format);
         va_list ap;
 
         va_start(ap, format);


@@ -2161,6 +2161,7 @@ static int bus_message_close_variant(sd_bus_message *m, struct bus_container *c)
 }
 
 static int bus_message_close_struct(sd_bus_message *m, struct bus_container *c, bool add_offset) {
 }
 
 static int bus_message_close_struct(sd_bus_message *m, struct bus_container *c, bool add_offset) {

+        bool fixed_size = true;

         size_t n_variable = 0;
         unsigned i = 0;
         const char *p;
         size_t n_variable = 0;
         unsigned i = 0;
         const char *p;


@@ -2196,6 +2197,8 @@ static int bus_message_close_struct(sd_bus_message *m, struct bus_container *c,
                 /* We need to add an offset for each item that has a
                  * variable size and that is not the last one in the
                  * list */
                 /* We need to add an offset for each item that has a
                  * variable size and that is not the last one in the
                  * list */

+                if (r == 0)
+                        fixed_size = false;

                 if (r == 0 && p[n] != 0)
                         n_variable++;
 
                 if (r == 0 && p[n] != 0)
                         n_variable++;
 


@@ -2206,8 +2209,27 @@ static int bus_message_close_struct(sd_bus_message *m, struct bus_container *c,
         assert(!c->need_offsets || i == c->n_offsets);
         assert(c->need_offsets || n_variable == 0);
 
         assert(!c->need_offsets || i == c->n_offsets);
         assert(c->need_offsets || n_variable == 0);
 

-        if (n_variable <= 0) {
-                a = message_extend_body(m, 1, 0, add_offset, false);
+        if (isempty(c->signature)) {
+                /* The unary type is encoded as fixed 1 byte padding */
+                a = message_extend_body(m, 1, 1, add_offset, false);
+                if (!a)
+                        return -ENOMEM;
+
+                *a = 0;
+        } else if (n_variable <= 0) {
+                int alignment = 1;
+
+                /* Structures with fixed-size members only have to be
+                 * fixed-size themselves. But gvariant requires all fixed-size
+                 * elements to be sized a multiple of their alignment. Hence,
+                 * we must *always* add final padding after the last member so
+                 * the overall size of the structure is properly aligned. */
+                if (fixed_size)
+                        alignment = bus_gvariant_get_alignment(strempty(c->signature));
+
+                assert(alignment > 0);
+
+                a = message_extend_body(m, alignment, 0, add_offset, false);

                 if (!a)
                         return -ENOMEM;
         } else {
                 if (!a)
                         return -ENOMEM;
         } else {


@@ -3799,6 +3821,14 @@ static int build_struct_offsets(
         assert(n_offsets);
 
         if (isempty(signature)) {
         assert(n_offsets);
 
         if (isempty(signature)) {

+                /* Unary type is encoded as *fixed* 1 byte padding */
+                r = message_peek_body(m, &m->rindex, 1, 1, &q);
+                if (r < 0)
+                        return r;
+
+                if (*(uint8_t *) q != 0)
+                        return -EBADMSG;
+

                 *item_size = 0;
                 *offsets = NULL;
                 *n_offsets = 0;
                 *item_size = 0;
                 *offsets = NULL;
                 *n_offsets = 0;


@@ -3939,12 +3969,6 @@ static int enter_struct_or_dict_entry(
                 if (r < 0)
                         return r;
 
                 if (r < 0)
                         return r;
 

-        } else if (c->item_size <= 0) {
-
-                /* gvariant empty struct */
-                *item_size = 0;
-                *offsets = NULL;
-                *n_offsets = 0;

         } else
                 /* gvariant with contents */
                 return build_struct_offsets(m, contents, c->item_size, item_size, offsets, n_offsets);
         } else
                 /* gvariant with contents */
                 return build_struct_offsets(m, contents, c->item_size, item_size, offsets, n_offsets);


@@ -4131,7 +4155,14 @@ _public_ int sd_bus_message_enter_container(sd_bus_message *m,
 
         w->before = before;
         w->begin = m->rindex;
 
         w->before = before;
         w->begin = m->rindex;

-        w->end = m->rindex + c->item_size;
+
+        /* Unary type has fixed size of 1, but virtual size of 0 */
+        if (BUS_MESSAGE_IS_GVARIANT(m) &&
+            type == SD_BUS_TYPE_STRUCT &&
+            isempty(signature))
+                w->end = m->rindex + 0;
+        else
+                w->end = m->rindex + c->item_size;

 
         w->array_size = array_size;
         w->item_size = item_size;
 
         w->array_size = array_size;
         w->item_size = item_size;


@@ -4741,7 +4772,6 @@ _public_ int sd_bus_message_skip(sd_bus_message *m, const char *types) {
                         r = sd_bus_message_skip(m, s);
                         if (r < 0)
                                 return r;
                         r = sd_bus_message_skip(m, s);
                         if (r < 0)
                                 return r;

-                        assert(r != 0);

 
                         r = sd_bus_message_exit_container(m);
                         if (r < 0)
 
                         r = sd_bus_message_exit_container(m);
                         if (r < 0)