From da84f235ef985883c79066204ee838717aacd41a Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 16 Jun 2019 09:01:54 +0000 Subject: child_spawn*: make sure posix_spawn() doesn't clobber pipes with dup2+close --- src/libstddjb/child_spawn3.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/libstddjb/child_spawn3.c') diff --git a/src/libstddjb/child_spawn3.c b/src/libstddjb/child_spawn3.c index 82220ea..9dbed41 100644 --- a/src/libstddjb/child_spawn3.c +++ b/src/libstddjb/child_spawn3.c @@ -62,14 +62,20 @@ pid_t child_spawn3 (char const *prog, char const *const *argv, char const *const } e = posix_spawn_file_actions_init(&actions) ; if (e) goto errattr ; - e = posix_spawn_file_actions_adddup2(&actions, p[1][0], fds[0]) ; - if (e) goto erractions ; - e = posix_spawn_file_actions_addclose(&actions, p[1][0]) ; - if (e) goto erractions ; - e = posix_spawn_file_actions_adddup2(&actions, p[0][1], fds[1]) ; - if (e) goto erractions ; - e = posix_spawn_file_actions_addclose(&actions, p[0][1]) ; - if (e) goto erractions ; + if (p[1][0] != fds[0]) + { + e = posix_spawn_file_actions_adddup2(&actions, p[1][0], fds[0]) ; + if (e) goto erractions ; + e = posix_spawn_file_actions_addclose(&actions, p[1][0]) ; + if (e) goto erractions ; + } + if (p[0][1] != fds[1]) + { + e = posix_spawn_file_actions_adddup2(&actions, p[0][1], fds[1]) ; + if (e) goto erractions ; + e = posix_spawn_file_actions_addclose(&actions, p[0][1]) ; + if (e) goto erractions ; + } { int haspath = !!getenv("PATH") ; size_t envlen = env_len(envp) ; -- cgit v1.2.3