picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

udev-event: do not read stdout or stderr if the pipefd is not created

Browse source 
Fixes #11255.
This commit is contained in:
Yu Watanabe 2018-12-26 00:36:55 +09:00 committed by Lennart Poettering
parent a5c67ccc57
commit adeb26c1af
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/udev/udev-event.c
View file

@ -570,13 +570,17 @@ static int spawn_wait(Spawn *spawn) {
}
}
r = sd_event_add_io(e, NULL, spawn->fd_stdout, EPOLLIN, on_spawn_io, spawn);
if (r < 0)
return r;
if (spawn->fd_stdout >= 0) {
r = sd_event_add_io(e, NULL, spawn->fd_stdout, EPOLLIN, on_spawn_io, spawn);
if (r < 0)
return r;
}
r = sd_event_add_io(e, NULL, spawn->fd_stderr, EPOLLIN, on_spawn_io, spawn);
if (r < 0)
return r;
if (spawn->fd_stderr >= 0) {
r = sd_event_add_io(e, NULL, spawn->fd_stderr, EPOLLIN, on_spawn_io, spawn);
if (r < 0)
return r;
}
r = sd_event_add_child(e, NULL, spawn->pid, WEXITED, on_spawn_sigchld, spawn);
if (r < 0)