X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-message.c;h=524f17eb9f952707ebdbc91da3c98121a4c14e1c;hp=a1bae4d1a76d75d467028c35e83f76eb19dfc893;hb=b8beb2781682738f3a59aab993bf2869447a77c9;hpb=80a46c7313b8fc4682881cb3a2ca9e4d743fcb2b

diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
index a1bae4d1a..524f17eb9 100644
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd-bus/bus-message.c
@@ -23,6 +23,7 @@
 
 #include "util.h"
 #include "utf8.h"
+#include "strv.h"
 
 #include "sd-bus.h"
 #include "bus-message.h"
@@ -322,6 +323,8 @@ int sd_bus_message_new_signal(
         if (!t)
                 return -ENOMEM;
 
+        t->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED;
+
         r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_PATH, SD_BUS_TYPE_OBJECT_PATH, path, &t->path);
         if (r < 0)
                 goto fail;
@@ -400,6 +403,8 @@ static int message_new_reply(
 
         if (!call)
                 return -EINVAL;
+        if (!call->sealed)
+                return -EPERM;
         if (call->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
                 return -EINVAL;
         if (!m)
@@ -409,6 +414,7 @@ static int message_new_reply(
         if (!t)
                 return -ENOMEM;
 
+        t->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED;
         t->reply_serial = BUS_MESSAGE_SERIAL(call);
 
         r = message_append_field_uint32(t, SD_BUS_MESSAGE_HEADER_REPLY_SERIAL, t->reply_serial);
@@ -424,6 +430,7 @@ static int message_new_reply(
         t->dont_send = !!(call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED);
 
         *m = t;
+        return 0;
 
 fail:
         message_free(t);
@@ -447,9 +454,7 @@ int sd_bus_message_new_method_error(
         sd_bus_message *t;
         int r;
 
-        if (!e)
-                return -EINVAL;
-        if (!e->name)
+        if (!sd_bus_error_is_set(e))
                 return -EINVAL;
         if (!m)
                 return -EINVAL;
@@ -763,11 +768,27 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void
 
         case SD_BUS_TYPE_STRING:
         case SD_BUS_TYPE_OBJECT_PATH:
+
+                if (!p) {
+                        if (e)
+                                c->signature[c->index] = 0;
+
+                        return -EINVAL;
+                }
+
                 align = 4;
                 sz = 4 + strlen(p) + 1;
                 break;
 
         case SD_BUS_TYPE_SIGNATURE:
+
+                if (!p) {
+                        if (e)
+                                c->signature[c->index] = 0;
+
+                        return -EINVAL;
+                }
+
                 align = 1;
                 sz = 1 + strlen(p) + 1;
                 break;
@@ -1893,7 +1914,7 @@ eof:
         return 0;
 }
 
-int sd_bus_message_rewind(sd_bus_message *m, bool complete) {
+int sd_bus_message_rewind(sd_bus_message *m, int complete) {
         struct bus_container *c;
 
         if (!m)
@@ -2210,8 +2231,8 @@ static int message_skip_fields(
                 } else if (bus_type_is_basic(t)) {
                         size_t align, k;
 
-                        align = bus_type_get_alignment(align);
-                        k = bus_type_get_size(align);
+                        align = bus_type_get_alignment(t);
+                        k = bus_type_get_size(t);
 
                         r = message_peek_fields(m, ri, align, k, NULL);
                         if (r < 0)
@@ -2426,6 +2447,10 @@ static int message_parse_fields(sd_bus_message *m) {
                 break;
         }
 
+        /* Try to read the error message, but if we can't it's a non-issue */
+        if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR)
+                sd_bus_message_read(m, "s", &m->error.message);
+
         return 0;
 }
 
@@ -2434,14 +2459,17 @@ static void setup_iovec(sd_bus_message *m) {
         assert(m->sealed);
 
         m->n_iovec = 0;
+        m->size = 0;
 
         m->iovec[m->n_iovec].iov_base = m->header;
         m->iovec[m->n_iovec].iov_len = sizeof(*m->header);
+        m->size += m->iovec[m->n_iovec].iov_len;
         m->n_iovec++;
 
         if (m->fields) {
                 m->iovec[m->n_iovec].iov_base = m->fields;
                 m->iovec[m->n_iovec].iov_len = m->header->fields_size;
+                m->size += m->iovec[m->n_iovec].iov_len;
                 m->n_iovec++;
 
                 if (m->header->fields_size % 8 != 0) {
@@ -2449,6 +2477,7 @@ static void setup_iovec(sd_bus_message *m) {
 
                         m->iovec[m->n_iovec].iov_base = (void*) padding;
                         m->iovec[m->n_iovec].iov_len = 8 - m->header->fields_size % 8;
+                        m->size += m->iovec[m->n_iovec].iov_len;
                         m->n_iovec++;
                 }
         }
@@ -2456,6 +2485,7 @@ static void setup_iovec(sd_bus_message *m) {
         if (m->body) {
                 m->iovec[m->n_iovec].iov_base = m->body;
                 m->iovec[m->n_iovec].iov_len = m->header->body_size;
+                m->size += m->iovec[m->n_iovec].iov_len;
                 m->n_iovec++;
         }
 }
@@ -2726,3 +2756,34 @@ int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz) {
 
         return 0;
 }
+
+int bus_message_read_strv_extend(sd_bus_message *m, char ***l) {
+        int r;
+
+        assert(m);
+        assert(l);
+
+        r = sd_bus_message_enter_container(m, 'a', "s");
+        if (r < 0)
+                return r;
+
+        for (;;) {
+                const char *s;
+
+                r = sd_bus_message_read_basic(m, 's', &s);
+                if (r < 0)
+                        return r;
+                if (r == 0)
+                        break;
+
+                r = strv_extend(l, s);
+                if (r < 0)
+                        return r;
+        }
+
+        r = sd_bus_message_exit_container(m);
+        if (r < 0)
+                return r;
+
+        return 0;
+}