From c2267164204a961273c71c9c103831895724b0b1 Mon Sep 17 00:00:00 2001
From: Ilya Zakharevich <ilya@math.berkeley.edu>
Date: Wed, 25 Feb 1998 21:47:46 -0500
Subject: Fix file-descriptor leak when pipes fail via taint checks: Subject:
 [PATCH] Some patches went through cracks

p4raw-id: //depot/perl@593
---
 os2/os2.c | 4 ++--
 util.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/os2/os2.c b/os2/os2.c
index fe7f99bb7e..f24c3af5ce 100644
--- a/os2/os2.c
+++ b/os2/os2.c
@@ -620,8 +620,6 @@ char	*mode;
     PerlIO *res;
     SV *sv;
     
-    if (pipe(p) < 0)
-	return Nullfp;
     /* `this' is what we use in the parent, `that' in the child. */
     this = (*mode == 'w');
     that = !this;
@@ -629,6 +627,8 @@ char	*mode;
 	taint_env();
 	taint_proper("Insecure %s%s", "EXEC");
     }
+    if (pipe(p) < 0)
+	return Nullfp;
     /* Now we need to spawn the child. */
     newfd = dup(*mode == 'r');		/* Preserve std* */
     if (p[that] != (*mode == 'r')) {
diff --git a/util.c b/util.c
index 0dd944333f..770aa29419 100644
--- a/util.c
+++ b/util.c
@@ -1855,14 +1855,14 @@ my_popen(char *cmd, char *mode)
 	return my_syspopen(cmd,mode);
     }
 #endif 
-    if (PerlProc_pipe(p) < 0)
-	return Nullfp;
     This = (*mode == 'w');
     that = !This;
     if (doexec && tainting) {
 	taint_env();
 	taint_proper("Insecure %s%s", "EXEC");
     }
+    if (PerlProc_pipe(p) < 0)
+	return Nullfp;
     while ((pid = (doexec?vfork():fork())) < 0) {
 	if (errno != EAGAIN) {
 	    PerlLIO_close(p[This]);
-- 
cgit v1.2.1