Mercurial > gnulib
changeset 10138:4df3c9e256b2
Make create_pipe_* safer w.r.t. file descriptor conflicts.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 01 Jun 2008 11:57:27 +0200 |
| parents | 6cbd47966fde |
| children | 0f46743a158e |
| files | ChangeLog lib/pipe.c modules/pipe |
| diffstat | 3 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 30 12:59:52 2008 +0200 +++ b/ChangeLog Sun Jun 01 11:57:27 2008 +0200 @@ -1,3 +1,9 @@ +2008-06-01 Bruno Haible <bruno@clisp.org> + + * lib/pipe.c: Include unistd-safer.h. + (create_pipe): Ensure the returned file descriptors are not in {0,1,2}. + * modules/pipe (Depends-on): Add unistd-safer. + 2008-05-30 Simon Josefsson <simon@josefsson.org> * modules/autobuild (configure.ac): Call AB_INIT.
--- a/lib/pipe.c Fri May 30 12:59:52 2008 +0200 +++ b/lib/pipe.c Sun Jun 01 11:57:27 2008 +0200 @@ -29,6 +29,7 @@ #include "error.h" #include "fatal-signal.h" +#include "unistd-safer.h" #include "wait-process.h" #include "gettext.h" @@ -147,10 +148,12 @@ prog_argv = prepare_spawn (prog_argv); if (pipe_stdout) - if (_pipe (ifd, 4096, O_BINARY | O_NOINHERIT) < 0) + if (_pipe (ifd, 4096, O_BINARY | O_NOINHERIT) < 0 + || (ifd[0] = fd_safer (ifd[0])) < 0) error (EXIT_FAILURE, errno, _("cannot create pipe")); if (pipe_stdin) - if (_pipe (ofd, 4096, O_BINARY | O_NOINHERIT) < 0) + if (_pipe (ofd, 4096, O_BINARY | O_NOINHERIT) < 0 + || (ofd[1] = fd_safer (ofd[1])) < 0) error (EXIT_FAILURE, errno, _("cannot create pipe")); /* Data flow diagram: * @@ -254,10 +257,12 @@ # endif if (pipe_stdout) - if (pipe (ifd) < 0) + if (pipe (ifd) < 0 + || (ifd[0] = fd_safer (ifd[0])) < 0) error (EXIT_FAILURE, errno, _("cannot create pipe")); if (pipe_stdin) - if (pipe (ofd) < 0) + if (pipe (ofd) < 0 + || (ofd[1] = fd_safer (ofd[1])) < 0) error (EXIT_FAILURE, errno, _("cannot create pipe")); /* Data flow diagram: *