isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init io_pipe[][] to -1, not 0

Browse Source
This commit is contained in:
Todd C. Miller
2017-04-20 15:09:07 -06:00
parent f3daaba1c4
commit 6e75179528
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/exec_pty.c
View File

@@ -643,7 +643,7 @@ static int
fork_pty(struct command_details *details, int sv[], sigset_t *omask) fork_pty(struct command_details *details, int sv[], sigset_t *omask)
{ {
struct command_status cstat; struct command_status cstat;
int io_pipe[3][2]; int io_pipe[3][2] = { { -1, -1 }, { -1, -1 }, { -1, -1 } };
sigaction_t sa; sigaction_t sa;
sigset_t mask; sigset_t mask;
pid_t child; pid_t child;
@@ -697,7 +697,6 @@ fork_pty(struct command_details *details, int sv[], sigset_t *omask)
* If either stdin, stdout or stderr is not a tty we use a pipe * If either stdin, stdout or stderr is not a tty we use a pipe
* to interpose ourselves instead of duping the pty fd. * to interpose ourselves instead of duping the pty fd.
*/ */
memset(io_pipe, 0, sizeof(io_pipe));
if (io_fds[SFD_STDIN] == -1 || !isatty(STDIN_FILENO)) { if (io_fds[SFD_STDIN] == -1 || !isatty(STDIN_FILENO)) {
sudo_debug_printf(SUDO_DEBUG_INFO, "stdin not a tty, creating a pipe"); sudo_debug_printf(SUDO_DEBUG_INFO, "stdin not a tty, creating a pipe");
pipeline = true; pipeline = true;
@@ -763,11 +762,11 @@ fork_pty(struct command_details *details, int sv[], sigset_t *omask)
(void)fcntl(sv[1], F_SETFD, FD_CLOEXEC); (void)fcntl(sv[1], F_SETFD, FD_CLOEXEC);
sigprocmask(SIG_SETMASK, omask, NULL); sigprocmask(SIG_SETMASK, omask, NULL);
/* Close the other end of the stdin/stdout/stderr pipes and exec. */ /* Close the other end of the stdin/stdout/stderr pipes and exec. */
if (io_pipe[STDIN_FILENO][1]) if (io_pipe[STDIN_FILENO][1] != -1)
close(io_pipe[STDIN_FILENO][1]); close(io_pipe[STDIN_FILENO][1]);
if (io_pipe[STDOUT_FILENO][0]) if (io_pipe[STDOUT_FILENO][0] != -1)
close(io_pipe[STDOUT_FILENO][0]); close(io_pipe[STDOUT_FILENO][0]);
if (io_pipe[STDERR_FILENO][0]) if (io_pipe[STDERR_FILENO][0] != -1)
close(io_pipe[STDERR_FILENO][0]); close(io_pipe[STDERR_FILENO][0]);
/* /*
* If stdin/stdout is not a tty, start command in the background * If stdin/stdout is not a tty, start command in the background
@@ -786,11 +785,11 @@ fork_pty(struct command_details *details, int sv[], sigset_t *omask)
} }
/* Close the other end of the stdin/stdout/stderr pipes. */ /* Close the other end of the stdin/stdout/stderr pipes. */
if (io_pipe[STDIN_FILENO][0]) if (io_pipe[STDIN_FILENO][0] != -1)
close(io_pipe[STDIN_FILENO][0]); close(io_pipe[STDIN_FILENO][0]);
if (io_pipe[STDOUT_FILENO][1]) if (io_pipe[STDOUT_FILENO][1] != -1)
close(io_pipe[STDOUT_FILENO][1]); close(io_pipe[STDOUT_FILENO][1]);
if (io_pipe[STDERR_FILENO][1]) if (io_pipe[STDERR_FILENO][1] != -1)
close(io_pipe[STDERR_FILENO][1]); close(io_pipe[STDERR_FILENO][1]);
debug_return_int(child); debug_return_int(child);