shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-09 13:57:42 +03:00
Code

bus: let's use GREEDY_REALLOC() when allocating space for containers

Browse Source
This commit is contained in:
Lennart Poettering 2013-12-16 20:00:25 +01:00
parent 531dca789e
commit 306f07be2f
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libsystemd-bus/bus-message.c
View File

@ -113,7 +113,7 @@ static void message_reset_containers(sd_bus_message *m) {
free(m->containers);
m->containers = NULL;
m->n_containers = 0;
m->n_containers = m->containers_allocated = 0;
m->root_container.index = 0;
}
@ -1109,7 +1109,7 @@ static int message_add_offset(sd_bus_message *m, size_t offset) {
if (!c->need_offsets)
return 0;
if (!GREEDY_REALLOC(c->offsets, c->n_offsets_allocated, c->n_offsets + 1))
if (!GREEDY_REALLOC(c->offsets, c->offsets_allocated, c->n_offsets + 1))
return -ENOMEM;
c->offsets[c->n_offsets++] = offset;
@ -1843,14 +1843,11 @@ _public_ int sd_bus_message_open_container(
assert_return(!m->poisoned, -ESTALE);
/* Make sure we have space for one more container */
w = realloc(m->containers, sizeof(struct bus_container) * (m->n_containers + 1));
if (!w) {
if (!GREEDY_REALLOC(m->containers, m->containers_allocated, m->n_containers + 1)) {
m->poisoned = true;
return -ENOMEM;
}
m->containers = w;
c = message_get_container(m);
signature = strdup(contents);
@ -1881,14 +1878,14 @@ _public_ int sd_bus_message_open_container(
}
/* OK, let's fill it in */
w += m->n_containers++;
w = m->containers + m->n_containers++;
w->enclosing = type;
w->signature = signature;
w->index = 0;
w->array_size = array_size;
w->before = before;
w->begin = begin;
w->n_offsets = w->n_offsets_allocated = 0;
w->n_offsets = w->offsets_allocated = 0;
w->offsets = NULL;
w->need_offsets = need_offsets;
@ -3854,10 +3851,8 @@ _public_ int sd_bus_message_enter_container(sd_bus_message *m,
if (m->n_containers >= BUS_CONTAINER_DEPTH)
return -EBADMSG;
w = realloc(m->containers, sizeof(struct bus_container) * (m->n_containers + 1));
if (!w)
if (!GREEDY_REALLOC(m->containers, m->containers_allocated, m->n_containers + 1))
return -ENOMEM;
m->containers = w;
if (message_end_of_signature(m))
return -ENXIO;
@ -3892,7 +3887,7 @@ _public_ int sd_bus_message_enter_container(sd_bus_message *m,
}
/* OK, let's fill it in */
w += m->n_containers++;
w = m->containers + m->n_containers++;
w->enclosing = type;
w->signature = signature;
w->index = 0;

3
src/libsystemd-bus/bus-message.h
View File

@ -46,7 +46,7 @@ struct bus_container {
uint32_t *array_size;
/* gvariant: list of offsets to end of children if this is struct/dict entry/array */
size_t *offsets, n_offsets, n_offsets_allocated, offset_index;
size_t *offsets, n_offsets, offsets_allocated, offset_index;
size_t item_size;
};
@ -115,6 +115,7 @@ struct sd_bus_message {
struct bus_container root_container, *containers;
unsigned n_containers;
size_t containers_allocated;
struct iovec *iovec;
struct iovec iovec_fixed[2];