summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ChangeLog3
-rw-r--r--lib/pipe-safer.c40
2 files changed, 24 insertions, 19 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 78d9b9090..9fa61ac7b 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,8 @@
2006-08-11 Paul Eggert <eggert@cs.ucla.edu>
+ * pipe-safer.c (pipe_safer): Fix misspelling: HAVE_FUNC_PIPE ->
+ HAVE_PIPE. Fix a file descriptor leak when fd_safer fails.
+
* regex_internal.c (re_string_skip_chars): Don't assume WEOF fits
in wchar_t. Problem reported by Eric Blake.
diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c
index 646cd5dab..81df99454 100644
--- a/lib/pipe-safer.c
+++ b/lib/pipe-safer.c
@@ -33,25 +33,27 @@
int
pipe_safer (int fd[2])
{
-#if HAVE_FUNC_PIPE
- int fail = pipe (fd);
- if (fail)
- return fail;
-
- {
- int i;
- for (i = 0; i < 2; i++)
- {
- int f = fd_safer (fd[i]);
- if (f < 0)
- return -1;
- fd[i] = f;
- }
- }
-
- return 0;
-#else /* ! HAVE_FUNC_PIPE */
+#if HAVE_PIPE
+ if (pipe (fd) == 0)
+ {
+ int i;
+ for (i = 0; i < 2; i++)
+ {
+ fd[i] = fd_safer (fd[i]);
+ if (fd[i] < 0)
+ {
+ int e = errno;
+ close (fd[1 - i]);
+ errno = e;
+ return -1;
+ }
+ }
+
+ return 0;
+ }
+#else
errno = ENOSYS;
- return -1;
#endif
+
+ return -1;
}