From: Nuno Lopes <nlopess@php.net>
Date: Tue, 2 Jan 2007 15:31:58 +0000 (+0000)
Subject: MFB
X-Git-Tag: RELEASE_1_0_0RC1~435
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80122d6b53946f4caf3597f1b618fb30c116b061;p=php

MFB
---

diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index fd82441887..5d068a4413 100644
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@ -602,8 +602,6 @@ PHP_FUNCTION(proc_open)
 				}
 #endif
 
-				
-
 			} else if (strcmp(Z_STRVAL_PP(ztype), "file") == 0) {
 				zval **zfile, **zmode;
 				char *filename;
@@ -781,7 +779,8 @@ PHP_FUNCTION(proc_open)
 		/* clean up all the descriptors */
 		for (i = 0; i < ndesc; i++) {
 			close(descriptors[i].childend);
-			close(descriptors[i].parentend);
+			if (descriptors[i].parentend)
+				close(descriptors[i].parentend);
 		}
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "procve failed - %s", strerror(errno));
 		goto exit_fail;
@@ -850,7 +849,8 @@ PHP_FUNCTION(proc_open)
 		/* clean up all the descriptors */
 		for (i = 0; i < ndesc; i++) {
 			close(descriptors[i].childend);
-			close(descriptors[i].parentend);
+			if (descriptors[i].parentend)
+				close(descriptors[i].parentend);
 		}
 
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "fork failed - %s", strerror(errno));