php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source 
* PHP-7.1:
  Fixed #69442 closing of fd incorrect when PTS enabled
This commit is contained in:
Joe Watkins
2017-01-06 06:58:08 +00:00
parent 969622cddf 69b1526dfe
commit 0ca4358ade
3 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -99,6 +99,7 @@ PHP NEWS
. Add subject to mail log. (tomsommer)
. Fixed bug #31875 (get_defined_functions additional param to exclude
disabled functions). (willianveiga)
. Fixed bug #69442 (closing of fd incorrect when PTS enabled). (jaytaph)
- XML:
. Moved utf8_encode() and utf8_decode() to the Standard extension. (Andrea)

13
ext/standard/proc_open.c
View File

@@ -811,6 +811,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 */
@@ -826,13 +832,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));
}

46
ext/standard/tests/file/bug69442.phpt Normal file
View File

@@ -0,0 +1,46 @@
--TEST--
proc_open with PTY closes incorrect file descriptor
--SKIPIF--
<?php
$code = <<< 'EOC'
<?php
$descriptors = array(array("pty"), array("pty"), array("pty"), array("pipe", "w"));
$pipes = array();
$process = proc_open('echo "foo";', $descriptors, $pipes);
EOC;
$tmpFile = tempnam(sys_get_temp_dir(), "bug69442");
file_put_contents($tmpFile, $code);
exec($_SERVER['TEST_PHP_EXECUTABLE']." ".$tmpFile." 2>&1", $output);
$output = join("\n", $output);
unlink($tmpFile);
if (strstr($output, "pty pseudo terminal not supported on this system") !== false) {
die("skip PTY pseudo terminals are not supported");
}
--FILE--
<?php
$cmd = '(echo "foo" ; exit 42;) 3>/dev/null; code=$?; echo $code >&3; exit $code';
$descriptors = array(array("pty"), array("pty"), array("pty"), array("pipe", "w"));
$pipes = array();
$process = proc_open($cmd, $descriptors, $pipes);
foreach ($pipes as $type => $pipe) {
$data = fread($pipe, 999);
echo 'type ' . $type . ' ';
var_dump($data);
fclose($pipe);
}
proc_close($process);
--EXPECT--
type 0 string(5) "foo
"
type 1 string(0) ""
type 2 string(0) ""
type 3 string(3) "42
"