enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

e client mixer handling - fix segv where inputs/sink cause segvs 

so i've been seeing this thing where inputs are deleted and then the
sink is appropriately deleted from clients but not all the client
windows it could have been on. the problem seems to manifest if
multiple windows come from the same app playing audio so the sink may
be assigned to only 1 window not all of them.

this seems to nuke the segv as the sink/input was being left dangling on a
window due to the logic in the add/del handling to give up when it finds the
first window target and not all of them.

so after a day or so of testing my segv's are gone. yay!

@fix.
This commit is contained in:
Carsten Haitzler 2019-01-16 11:31:41 +00:00
parent 31c897fa13
commit a841544d03
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/mixer/e_mod_main.c
View File

@ -925,7 +925,7 @@ _get_ppid(pid_t pid)
static void
_sink_input_event(int type, Emix_Sink_Input *input)
{
Eina_List *clients, *l;
Eina_List *clients, *l, *ll;
E_Client *ec;
E_Client_Volume_Sink *sink;
pid_t pid;
@ -934,9 +934,9 @@ _sink_input_event(int type, Emix_Sink_Input *input)
{
case EMIX_SINK_INPUT_ADDED_EVENT:
pid = input->pid;
while (42)
if ((pid <= 1) || (pid == getpid())) return;
else
{
if (pid <= 1 || pid == getpid()) return;
clients = e_client_focus_stack_get();
EINA_LIST_FOREACH(clients, l, ec)
{
@ -952,20 +952,18 @@ _sink_input_event(int type, Emix_Sink_Input *input)
input);
e_client_volume_sink_append(ec, sink);
_client_sinks = eina_list_append(_client_sinks, sink);
return;
}
}
pid = _get_ppid(pid);
}
break;
case EMIX_SINK_INPUT_REMOVED_EVENT:
EINA_LIST_FOREACH(_client_sinks, l, sink)
EINA_LIST_FOREACH_SAFE(_client_sinks, l, ll, sink)
{
if (sink->data == input)
{
e_client_volume_sink_del(sink);
_client_sinks = eina_list_remove_list(_client_sinks, l);
break;
}
}
break;