Merge branch 'pull-request/1588' into PHP-7.0

* pull-request/1588:
  Fixed #69442 closing of fd incorrect when PTS enabled

1 files changed, 6 insertions, 7 deletions

diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index 12d7090ac4..b274dc462b 100644
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@ -820,6 +820,12 @@ PHP_FUNCTION(proc_open)
 		}
 #endif
 
+#if PHP_CAN_DO_PTS
+		if (dev_ptmx >= 0) {
+			close(dev_ptmx);
+			close(slave_pty);
+		}
+#endif
 		/* close those descriptors that we just opened for the parent stuff,
 		 * dup new descriptors into required descriptors and close the original
 		 * cruft */
@@ -835,13 +841,6 @@ PHP_FUNCTION(proc_open)
 				close(descriptors[i].childend);
 		}
 
-#if PHP_CAN_DO_PTS
-		if (dev_ptmx >= 0) {
-			close(dev_ptmx);
-			close(slave_pty);
-		}
-#endif
-
 		if (cwd) {
 			php_ignore_value(chdir(cwd));
 		}