assert(m);
assert(m->sealed);
- assert(!m->kdbus);
+
+ if (m->kdbus)
+ return 0;
if (m->destination) {
r = parse_unique_name(m->destination, &unique);
if (m->body)
append_payload_vec(&d, m->body, m->header->body_size);
- m->kdbus->size = (uint8_t*) m - (uint8_t*) m->kdbus;
+ m->kdbus->size = (uint8_t*) d - (uint8_t*) m->kdbus;
assert(m->kdbus->size <= sz);
+ m->free_kdbus = true;
+
return 0;
}
continue;
l = d->size - offsetof(struct kdbus_msg_data, data);
-
if (idx == sizeof(struct bus_header) &&
l == BUS_MESSAGE_FIELDS_SIZE(m))
m->fields = d->data;
else if (idx == sizeof(struct bus_header) + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)) &&
l == BUS_MESSAGE_BODY_SIZE(m))
m->body = d->data;
- else {
+ else if (!(idx == 0 && l == sizeof(struct bus_header)) &&
+ !(idx == sizeof(struct bus_header) + BUS_MESSAGE_FIELDS_SIZE(m))) {
sd_bus_message_unref(m);
return -EBADMSG;
}
if (errno == EAGAIN)
return 0;
- if (errno != -EMSGSIZE)
+ if (errno != ENOBUFS)
return -errno;
sz *= 2;
if (!p)
return -ENOMEM;
- if (ioctl(fd, KDBUS_CMD_BUS_MAKE, &fname) < 0) {
+ if (ioctl(fd, KDBUS_CMD_BUS_MAKE, fname) < 0) {
close_nointr_nofail(fd);
free(p);
return -errno;