Commit 88fe224c authored by Lennart Poettering's avatar Lennart Poettering

bus: always explicitly rewind read index before passing message to caller or callback

parent 42c5aaf3
......@@ -251,6 +251,10 @@ int bus_match_run(
node->leaf.last_iteration = bus->iteration_counter;
}
r = sd_bus_message_rewind(m, true);
if (r < 0)
return r;
/* Run the callback. And then invoke siblings. */
assert(node->leaf.callback);
r = node->leaf.callback(bus, ret, m, node->leaf.userdata);
......
......@@ -1584,6 +1584,10 @@ static int process_reply(sd_bus *bus, sd_bus_message *m) {
if (c->timeout != 0)
prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx);
r = sd_bus_message_rewind(m, true);
if (r < 0)
return r;
r = c->callback(bus, 0, m, c->userdata);
free(c);
......@@ -1611,6 +1615,10 @@ static int process_filter(sd_bus *bus, sd_bus_message *m) {
l->last_iteration = bus->iteration_counter;
r = sd_bus_message_rewind(m, true);
if (r < 0)
return r;
r = l->callback(bus, 0, m, l->userdata);
if (r != 0)
return r;
......@@ -1720,6 +1728,10 @@ static int process_object(sd_bus *bus, sd_bus_message *m) {
c->last_iteration = bus->iteration_counter;
r = sd_bus_message_rewind(m, true);
if (r < 0)
return r;
r = c->callback(bus, 0, m, c->userdata);
if (r != 0)
return r;
......@@ -1746,6 +1758,10 @@ static int process_object(sd_bus *bus, sd_bus_message *m) {
c->last_iteration = bus->iteration_counter;
r = sd_bus_message_rewind(m, true);
if (r < 0)
return r;
r = c->callback(bus, 0, m, c->userdata);
if (r != 0)
return r;
......@@ -1930,6 +1946,10 @@ static int process_running(sd_bus *bus, sd_bus_message **ret) {
goto null_message;
if (ret) {
r = sd_bus_message_rewind(m, true);
if (r < 0)
return r;
*ret = m;
m = NULL;
return 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment