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

module-filter-apply: Fix a memory leak

Browse source 
Dynamic memory allocated to 'module_name' and 'fltr' was being leaked.
Its now freed properly before return.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=95293

Signed-off-by: Sachin Kumar Chauhan <sachin.kc@samsung.com>
Signed-off-by: Arun Raghavan <arun@arunraghavan.net>
This commit is contained in:
Sachin Kumar Chauhan 2016-05-10 11:40:03 +05:30 • committed by Arun Raghavan
parent fcee3da944
commit a19e1e5382
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/modules/module-filter-apply.c
View file

@ -416,6 +416,8 @@ static pa_hook_result_t process(struct userdata *u, pa_object *o, bool is_sink_i
pa_sink *sink = NULL; pa_sink *sink = NULL;
pa_source *source = NULL; pa_source *source = NULL;
pa_module *module = NULL; pa_module *module = NULL;
char *module_name = NULL;
struct filter *fltr = NULL, *filter = NULL;
if (is_sink_input) { if (is_sink_input) {
sink = PA_SINK_INPUT(o)->sink; sink = PA_SINK_INPUT(o)->sink;
@ -431,31 +433,27 @@ static pa_hook_result_t process(struct userdata *u, pa_object *o, bool is_sink_i
/* If there is no sink/source yet, we can't do much */ /* If there is no sink/source yet, we can't do much */
if ((is_sink_input && !sink) || (!is_sink_input && !source)) if ((is_sink_input && !sink) || (!is_sink_input && !source))
return PA_HOOK_OK; goto done;
/* If the stream doesn't what any filter, then let it be. */ /* If the stream doesn't what any filter, then let it be. */
if ((want = should_filter(o, is_sink_input))) { if ((want = should_filter(o, is_sink_input))) {
char *module_name;
struct filter *fltr, *filter;
/* We need to ensure the SI is playing on a sink of this type /* We need to ensure the SI is playing on a sink of this type
* attached to the sink it's "officially" playing on */ * attached to the sink it's "officially" playing on */
if (!module) if (!module)
return PA_HOOK_OK; goto done;
module_name = pa_sprintf_malloc("module-%s", want); module_name = pa_sprintf_malloc("module-%s", want);
if (pa_streq(module->name, module_name)) { if (pa_streq(module->name, module_name)) {
pa_log_debug("Stream appears to be playing on an appropriate sink already. Ignoring."); pa_log_debug("Stream appears to be playing on an appropriate sink already. Ignoring.");
pa_xfree(module_name); goto done;
return PA_HOOK_OK;
} }
fltr = filter_new(want, sink, source); fltr = filter_new(want, sink, source);
if (should_group_filter(fltr) && !find_paired_master(u, fltr, o, is_sink_input)) { if (should_group_filter(fltr) && !find_paired_master(u, fltr, o, is_sink_input)) {
pa_log_debug("Want group filtering but don't have enough streams."); pa_log_debug("Want group filtering but don't have enough streams.");
return PA_HOOK_OK; goto done;
} }
if (!(filter = pa_hashmap_get(u->filters, fltr))) { if (!(filter = pa_hashmap_get(u->filters, fltr))) {
@ -478,14 +476,10 @@ static pa_hook_result_t process(struct userdata *u, pa_object *o, bool is_sink_i
pa_xfree(args); pa_xfree(args);
} }
pa_xfree(fltr);
if (!filter) { if (!filter) {
pa_log("Unable to load %s", module_name); pa_log("Unable to load %s", module_name);
pa_xfree(module_name); goto done;
return PA_HOOK_OK;
} }
pa_xfree(module_name);
/* We can move the stream now as we know the destination. If this /* We can move the stream now as we know the destination. If this
* isn't true, we will do it later when the sink appears. */ * isn't true, we will do it later when the sink appears. */
@ -495,7 +489,6 @@ static pa_hook_result_t process(struct userdata *u, pa_object *o, bool is_sink_i
} }
} else { } else {
void *state; void *state;
struct filter *filter = NULL;
/* We do not want to filter... but are we already filtered? /* We do not want to filter... but are we already filtered?
* This can happen if an input's proplist changes */ * This can happen if an input's proplist changes */
@ -511,6 +504,10 @@ static pa_hook_result_t process(struct userdata *u, pa_object *o, bool is_sink_i
if (done_something) if (done_something)
trigger_housekeeping(u); trigger_housekeeping(u);
done:
pa_xfree(module_name);
pa_xfree(fltr);
return PA_HOOK_OK; return PA_HOOK_OK;
} }