diff options
| -rw-r--r-- | src/libsystemd/sd-bus/bus-message.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 697553e74e..bd3e1f3446 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -4057,7 +4057,7 @@ _public_ int sd_bus_message_enter_container(sd_bus_message *m, end = m->rindex + 0; else end = m->rindex + c->item_size; - + m->containers[m->n_containers++] = (struct bus_container) { .enclosing = type, .signature = TAKE_PTR(signature), @@ -5078,6 +5078,7 @@ int bus_message_parse_fields(sd_bus_message *m) { return -EBADMSG; if (*p == 0) { + char *k; size_t l; /* We found the beginning of the signature @@ -5091,9 +5092,11 @@ int bus_message_parse_fields(sd_bus_message *m) { p[1 + l - 1] != SD_BUS_TYPE_STRUCT_END) return -EBADMSG; - if (free_and_strndup(&m->root_container.signature, - p + 1 + 1, l - 2) < 0) + k = memdup_suffix0(p + 1 + 1, l - 2); + if (!k) return -ENOMEM; + + free_and_replace(m->root_container.signature, k); break; } |