GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure a spawned process has all standard fds connected.

Browse Source 
* src/posix-io.c (_gpgme_io_spawn): dup /dev/null also to unsued
stdout.
--

Better be sure that stdout of a spawned process is connected to stdout
so that the process does not run into a write error if it writes to
stdout.  AFAICS we always use a connected stdout; thus this is only
for correctness.
This commit is contained in:
Werner Koch 2014-04-10 11:15:40 +02:00
parent 766355b5d4
commit 617d3be629
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/posix-io.c
View File

@ -402,6 +402,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
/* Child. */ /* Child. */
int seen_stdin = 0; int seen_stdin = 0;
int seen_stdout = 0;
int seen_stderr = 0; int seen_stderr = 0;
if (atfork) if (atfork)
@ -430,6 +431,8 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
if (child_fd == 0) if (child_fd == 0)
seen_stdin = 1; seen_stdin = 1;
else if (child_fd == 1)
seen_stdout = 1;
else if (child_fd == 2) else if (child_fd == 2)
seen_stderr = 1; seen_stderr = 1;
@ -451,56 +454,38 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
close (fd_list[i].fd); close (fd_list[i].fd);
} }
if (! seen_stdin || ! seen_stderr) if (! seen_stdin || ! seen_stdout || !seen_stderr)
{ {
fd = open ("/dev/null", O_RDWR); fd = open ("/dev/null", O_RDWR);
if (fd == -1) if (fd == -1)
{ {
#if 0 /* The debug file descriptor is not dup'ed, so we
/* FIXME: The debug file descriptor is not dup'ed can't do a trace output. */
anyway, so we can't see this. */
TRACE_LOG1 ("can't open `/dev/null': %s\n",
strerror (errno));
#endif
_exit (8); _exit (8);
} }
/* Make sure that the process has a connected stdin. */ /* Make sure that the process has connected stdin. */
if (! seen_stdin && fd != 0) if (! seen_stdin && fd != 0)
{ {
if (dup2 (fd, 0) == -1) if (dup2 (fd, 0) == -1)
{
#if 0
/* FIXME: The debug file descriptor is not dup'ed
anyway, so we can't see this. */
TRACE_LOG1 ("dup2(/dev/null, 0) failed: %s\n",
strerror (errno));
#endif
_exit (8); _exit (8);
} }
if (! seen_stdout && fd != 1)
{
if (dup2 (fd, 1) == -1)
_exit (8);
} }
if (! seen_stderr && fd != 2) if (! seen_stderr && fd != 2)
if (dup2 (fd, 2) == -1)
{ {
#if 0 if (dup2 (fd, 2) == -1)
/* FIXME: The debug file descriptor is not dup'ed
anyway, so we can't see this. */
TRACE_LOG1 ("dup2(dev/null, 2) failed: %s\n",
strerror (errno));
#endif
_exit (8); _exit (8);
} }
if (fd != 0 && fd != 2) if (fd != 0 && fd != 1 && fd != 2)
close (fd); close (fd);
} }
execv (path, (char *const *) argv); execv (path, (char *const *) argv);
/* Hmm: in that case we could write a special status code to the /* Hmm: in that case we could write a special status code to the
status-pipe. */ status-pipe. */
#if 0
/* FIXME: The debug file descriptor is not dup'ed anyway, so
we can't see this. */
TRACE_LOG1 ("exec of `%s' failed\n", path);
#endif
_exit (8); _exit (8);
/* End child. */ /* End child. */
} }