mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: module-combine-sink: remove hooks

Browse source 
Remove hooks when the module is unloaded to avoid
use-after-free issues. Remove the cleanup source as well.

Fixes #1259.
This commit is contained in:
Barnabás Pőcze 2021-06-04 02:26:17 +02:00 • committed by Wim Taymans
parent 4cb87317a7
commit e65afe8fa2
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/module-protocol-pulse/modules/module-combine-sink.c
View file

@ -284,8 +284,11 @@ static const struct pw_manager_events manager_events = {
.added = manager_added, .added = manager_added,
}; };
static void cleanup_stream(struct combine_stream *s) { static void cleanup_stream(struct combine_stream *s)
{
spa_hook_remove(&s->stream_listener);
pw_stream_destroy(s->stream); pw_stream_destroy(s->stream);
s->stream = NULL; s->stream = NULL;
s->data = NULL; s->data = NULL;
s->cleanup = false; s->cleanup = false;
@ -370,20 +373,31 @@ static int module_combine_sink_unload(struct client *client, struct module *modu
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->cleanup != NULL)
pw_loop_destroy_source(module->impl->loop, d->cleanup);
/* Note that we explicitly disconnect the hooks to avoid having the /* Note that we explicitly disconnect the hooks to avoid having the
* cleanup triggered again in those callbacks */ * cleanup triggered again in those callbacks */
if (d->sink != NULL) { if (d->sink != NULL) {
spa_hook_remove(&d->sink_listener); spa_hook_remove(&d->sink_listener);
pw_stream_destroy(d->sink); pw_stream_destroy(d->sink);
} }
for (i = 0; i < MAX_SINKS; i++) { for (i = 0; i < MAX_SINKS; i++) {
if (d->streams[i].stream) if (d->streams[i].stream)
cleanup_stream(&d->streams[i]); cleanup_stream(&d->streams[i]);
} }
if (d->manager != NULL)
if (d->manager != NULL) {
spa_hook_remove(&d->manager_listener);
pw_manager_destroy(d->manager); pw_manager_destroy(d->manager);
if (d->core != NULL) }
if (d->core != NULL) {
spa_hook_remove(&d->core_listener);
pw_core_disconnect(d->core); pw_core_disconnect(d->core);
}
pw_free_strv(d->sink_names); pw_free_strv(d->sink_names);
free(d->sink_name); free(d->sink_name);