mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: make sure messages are freed

Browse source 
don't leak the command messages.

Fixes #337
This commit is contained in:
Wim Taymans 2020-10-20 11:01:17 +02:00
parent 389a0eee48
commit 425abbf3e9
1 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -181,15 +181,19 @@ struct command {
}; };
static const struct command commands[COMMAND_MAX]; static const struct command commands[COMMAND_MAX];
static void message_free(struct client *client, struct message *msg, bool destroy) static void message_free(struct client *client, struct message *msg, bool dequeue, bool destroy)
{ {
if (dequeue)
spa_list_remove(&msg->link); spa_list_remove(&msg->link);
if (destroy) { if (destroy) {
pw_log_trace("destroy message %p", msg);
free(msg->data); free(msg->data);
free(msg); free(msg);
} else } else {
pw_log_trace("recycle message %p", msg);
spa_list_append(&client->free_messages, &msg->link); spa_list_append(&client->free_messages, &msg->link);
} }
}
static struct message *message_alloc(struct client *client, uint32_t channel, uint32_t size) static struct message *message_alloc(struct client *client, uint32_t channel, uint32_t size)
{ {
@ -198,9 +202,12 @@ static struct message *message_alloc(struct client *client, uint32_t channel, ui
if (!spa_list_is_empty(&client->free_messages)) { if (!spa_list_is_empty(&client->free_messages)) {
msg = spa_list_first(&client->free_messages, struct message, link); msg = spa_list_first(&client->free_messages, struct message, link);
spa_list_remove(&msg->link); spa_list_remove(&msg->link);
pw_log_trace("using recycled message %p", msg);
} }
if (msg == NULL) if (msg == NULL) {
msg = calloc(1, sizeof(struct message)); msg = calloc(1, sizeof(struct message));
pw_log_trace("new message %p", msg);
}
if (msg == NULL) if (msg == NULL)
return NULL; return NULL;
ensure_size(msg, size); ensure_size(msg, size);
@ -238,7 +245,7 @@ static int flush_messages(struct client *client)
data = m->data + idx; data = m->data + idx;
size = m->length - idx; size = m->length - idx;
} else { } else {
message_free(client, m, false); message_free(client, m, true, false);
client->out_index = 0; client->out_index = 0;
continue; continue;
} }
@ -2501,9 +2508,9 @@ static void client_free(struct client *client)
pw_map_clear(&client->streams); pw_map_clear(&client->streams);
spa_list_consume(msg, &client->free_messages, link) spa_list_consume(msg, &client->free_messages, link)
message_free(client, msg, true); message_free(client, msg, true, true);
spa_list_consume(msg, &client->out_messages, link) spa_list_consume(msg, &client->out_messages, link)
message_free(client, msg, true); message_free(client, msg, true, true);
if (client->core) { if (client->core) {
client->disconnecting = true; client->disconnecting = true;
pw_core_disconnect(client->core); pw_core_disconnect(client->core);
@ -2551,8 +2558,8 @@ static int handle_packet(struct client *client, struct message *msg)
pw_log_error(NAME" %p: command %d (%s) error: %s", pw_log_error(NAME" %p: command %d (%s) error: %s",
impl, command, commands[command].name, spa_strerror(res)); impl, command, commands[command].name, spa_strerror(res));
} }
finish: finish:
message_free(client, msg, false, false);
return res; return res;
} }
@ -2563,6 +2570,7 @@ static int handle_memblock(struct client *client, struct message *msg)
uint32_t channel, flags, index; uint32_t channel, flags, index;
int64_t offset; int64_t offset;
int32_t filled; int32_t filled;
int res;
channel = ntohl(client->desc.channel); channel = ntohl(client->desc.channel);
offset = (int64_t) ( offset = (int64_t) (
@ -2575,8 +2583,10 @@ static int handle_memblock(struct client *client, struct message *msg)
flags, msg->length); flags, msg->length);
stream = pw_map_lookup(&client->streams, channel); stream = pw_map_lookup(&client->streams, channel);
if (stream == NULL) if (stream == NULL) {
return -EINVAL; res = -EINVAL;
goto finish;
}
pw_log_debug("new block %p %p/%u", msg, msg->data, msg->length); pw_log_debug("new block %p %p/%u", msg, msg->data, msg->length);
@ -2596,9 +2606,10 @@ static int handle_memblock(struct client *client, struct message *msg)
index + msg->length); index + msg->length);
stream->write_index += msg->length; stream->write_index += msg->length;
} }
message_free(client, msg, false); res = 0;
finish:
return 0; message_free(client, msg, false, false);
return res;
} }
static int do_read(struct client *client) static int do_read(struct client *client)
@ -2659,7 +2670,7 @@ static int do_read(struct client *client)
} }
} }
if (client->message) if (client->message)
message_free(client, client->message, false); message_free(client, client->message, false, false);
client->message = message_alloc(client, channel, length); client->message = message_alloc(client, channel, length);
} else if (client->message && } else if (client->message &&
client->in_index >= client->message->length + sizeof(client->desc)) { client->in_index >= client->message->length + sizeof(client->desc)) {