mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

combine: Fix a crash on shutdown if the module is loaded outside of our control.

Browse source 
By using module indexes rather than module pointers we avoid this posibility.
This commit is contained in:
Colin Guthrie 2011-06-08 20:26:07 +01:00
parent b865999126
commit 1c6e5d4e81
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-combine.c
View file

@ -39,20 +39,22 @@ PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_DEPRECATED("Please use module-combine-sink instead of module-combine!"); PA_MODULE_DEPRECATED("Please use module-combine-sink instead of module-combine!");
struct userdata { struct userdata {
pa_module *module; uint32_t module_index;
}; };
int pa__init(pa_module*m) { int pa__init(pa_module*m) {
struct userdata *u; struct userdata *u;
pa_module *module;
pa_assert(m); pa_assert(m);
pa_assert_se(m->userdata = u = pa_xnew0(struct userdata, 1)); pa_assert_se(m->userdata = u = pa_xnew0(struct userdata, 1));
pa_log_warn("We will now load module-combine-sink. Please make sure to remove module-combine from your configuration."); pa_log_warn("We will now load module-combine-sink. Please make sure to remove module-combine from your configuration.");
u->module = pa_module_load(m->core, "module-combine-sink", m->argument); module = pa_module_load(m->core, "module-combine-sink", m->argument);
u->module_index = module ? module->index : PA_INVALID_INDEX;
return u->module ? 0 : -1; return module ? 0 : -1;
} }
@ -64,8 +66,8 @@ void pa__done(pa_module*m) {
u = m->userdata; u = m->userdata;
if (u) if (u && PA_INVALID_INDEX != u->module_index)
pa_module_unload_request(u->module, TRUE); pa_module_unload_by_index(m->core, u->module_index, TRUE);
pa_xfree(u); pa_xfree(u);
} }