diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-06 08:05:51 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-06 08:05:51 -0300 |
| commit | 47dfb8d658406ebf07225c0104ebe4be06ae405f (patch) | |
| tree | 83174cbd9592560c48ad2cd11afe42c5c12b6c1b /lib/libc/gen/posix_spawn.c | |
| parent | 131cd15b13bbd3e141e911a65cf7a1895ec6ab05 (diff) | |
| parent | 13d657a35d96e65f1be391830f36e1adff33534f (diff) | |
| download | FreeBSD-src-47dfb8d658406ebf07225c0104ebe4be06ae405f.zip FreeBSD-src-47dfb8d658406ebf07225c0104ebe4be06ae405f.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'lib/libc/gen/posix_spawn.c')
| -rw-r--r-- | lib/libc/gen/posix_spawn.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index c65a730..2838c5c 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -140,7 +140,7 @@ process_spawnattr(const posix_spawnattr_t sa) static int process_file_actions_entry(posix_spawn_file_actions_entry_t *fae) { - int fd; + int fd, saved_errno; switch (fae->fae_action) { case FAE_OPEN: @@ -149,8 +149,11 @@ process_file_actions_entry(posix_spawn_file_actions_entry_t *fae) if (fd < 0) return (errno); if (fd != fae->fae_fildes) { - if (_dup2(fd, fae->fae_fildes) == -1) - return (errno); + if (_dup2(fd, fae->fae_fildes) == -1) { + saved_errno = errno; + (void)_close(fd); + return (saved_errno); + } if (_close(fd) != 0) { if (errno == EBADF) return (EBADF); |
