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

stream-interaction: Fix a memory leak

Browse source 
CID: 1352053
This commit is contained in:
Arun Raghavan 2016-08-10 21:23:44 +05:30
parent fd2c630e33
commit 74c9549a42
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/stream-interaction.c
View file

@ -319,6 +319,7 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
struct userdata *u; struct userdata *u;
const char *roles; const char *roles;
char *roles_in_group = NULL;
bool global = false; bool global = false;
uint32_t i = 0; uint32_t i = 0;
@ -396,8 +397,8 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
roles = pa_modargs_get_value(ma, "trigger_roles", NULL); roles = pa_modargs_get_value(ma, "trigger_roles", NULL);
if (roles) { if (roles) {
const char *group_split_state = NULL; const char *group_split_state = NULL;
char *roles_in_group = NULL;
i = 0; i = 0;
while ((roles_in_group = pa_split(roles, "/", &group_split_state))) { while ((roles_in_group = pa_split(roles, "/", &group_split_state))) {
if (roles_in_group[0] != '\0') { if (roles_in_group[0] != '\0') {
const char *split_state = NULL; const char *split_state = NULL;
@ -414,9 +415,10 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
i++; i++;
} else { } else {
pa_log("empty trigger roles"); pa_log("empty trigger roles");
pa_xfree(roles_in_group);
goto fail; goto fail;
} }
pa_xfree(roles_in_group);
} }
} }
if (pa_idxset_isempty(u->groups[0]->trigger_roles)) { if (pa_idxset_isempty(u->groups[0]->trigger_roles)) {
@ -427,8 +429,8 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
roles = pa_modargs_get_value(ma, u->duck ? "ducking_roles" : "cork_roles", NULL); roles = pa_modargs_get_value(ma, u->duck ? "ducking_roles" : "cork_roles", NULL);
if (roles) { if (roles) {
const char *group_split_state = NULL; const char *group_split_state = NULL;
char *roles_in_group = NULL;
i = 0; i = 0;
while ((roles_in_group = pa_split(roles, "/", &group_split_state))) { while ((roles_in_group = pa_split(roles, "/", &group_split_state))) {
if (roles_in_group[0] != '\0') { if (roles_in_group[0] != '\0') {
const char *split_state = NULL; const char *split_state = NULL;
@ -445,9 +447,10 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
i++; i++;
} else { } else {
pa_log("empty ducking roles"); pa_log("empty ducking roles");
pa_xfree(roles_in_group);
goto fail; goto fail;
} }
pa_xfree(roles_in_group);
} }
} }
if (pa_idxset_isempty(u->groups[0]->interaction_roles)) { if (pa_idxset_isempty(u->groups[0]->interaction_roles)) {
@ -503,6 +506,8 @@ fail:
if (ma) if (ma)
pa_modargs_free(ma); pa_modargs_free(ma);
if (roles_in_group)
pa_xfree(roles_in_group);
return -1; return -1;