mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-gsettings: Handle I/O hangup

Browse source 
When child `gsettings-helper` terminates prematurely, unconditionally reading
from child pipe fails in a busy loop until child process is reaped.

Fix this by terminating module upon PA_IO_EVENT_HANGUP or PA_IO_EVENT_ERROR.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/600>
This commit is contained in:
Igor V. Kovalenko 2021-07-04 09:58:26 +03:00
parent 7580ef31a1
commit 0555d4f5a5
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/gsettings/module-gsettings.c
View file

@ -64,7 +64,7 @@ int pa__init(pa_module*m) {
u->io_event = m->core->mainloop->io_new(
m->core->mainloop,
u->fd,
PA_IO_EVENT_INPUT,
PA_IO_EVENT_INPUT | PA_IO_EVENT_HANGUP | PA_IO_EVENT_ERROR,
io_event_cb,
u);

22
src/modules/stdin-util.c
View file

@ -267,13 +267,19 @@ void io_event_cb(
struct userdata *u = userdata;
if (handle_event(u) < 0) {
if (u->io_event) {
u->core->mainloop->io_free(u->io_event);
u->io_event = NULL;
}
pa_module_unload_request(u->module, true);
if (events & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR)) {
pa_log("Lost I/O connection in module \"%s\"", u->module->name);
goto fail;
}
if (handle_event(u) >= 0)
return;
fail:
if (u->io_event) {
u->core->mainloop->io_free(u->io_event);
u->io_event = NULL;
}
pa_module_unload_request(u->module, true);
}