danog/process
1
0
Fork 0
mirror of https://github.com/danog/process.git synced 2024-11-26 12:14:43 +01:00
Code Issues Projects Releases Wiki Activity

Use correct FD index in FD array

Browse Source
This commit is contained in:
Aaron Piotrowski 2019-01-28 11:55:02 -06:00
parent a461b7d975
commit 974c6e2048
No known key found for this signature in database
GPG Key ID: ADD1EF783EDE9EEB
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Internal/Posix/Runner.php
View File

@ -23,7 +23,6 @@ final class Runner implements ProcessRunner
["pipe", "w"], // stderr
["pipe", "w"], // exit code pipe
];
const FD_COUNT = 4;
/** @var string|null */
private static $fdPath;
@ -137,20 +136,22 @@ final class Runner implements ProcessRunner
self::$fdPath = \file_exists("/dev/fd") ? "/dev/fd" : "/proc/self/fd";
}
$fds = @\scandir(self::$fdPath, \SCANDIR_SORT_NONE);
$fdList = @\scandir(self::$fdPath, \SCANDIR_SORT_NONE);
if ($fds === false) {
if ($fdList === false) {
throw new ProcessException("Unable to list open file descriptors");
}
$fds = \array_filter($fds, function (string $path): bool {
$fdList = \array_filter($fdList, function (string $path): bool {
return $path !== "." && $path !== "..";
});
return \array_merge(
self::FD_SPEC,
\array_fill(self::FD_COUNT, \count($fds) - self::FD_COUNT, ["file", "/dev/null", "r"])
);
$fds = [];
foreach ($fdList as $id) {
$fds[(int) $id] = ["file", "/dev/null", "r"];
}
return self::FD_SPEC + $fds;
}
/** @inheritdoc */