8000 [Process] Fix handling empty path found in the PATH env var with ExecutableFinder by nicolas-grekas · Pull Request #58711 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Process] Fix handling empty path found in the PATH env var with ExecutableFinder #58711

8000 New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2024
Merged

[Process] Fix handling empty path found in the PATH env var with ExecutableFinder #58711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Symfony/Component/Process/ExecutableFinder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public function find(string $name, ?string $default = null, array $extraDirs = [
}
foreach ($suffixes as $suffix) {
foreach ($dirs as $dir) {
if ('' === $dir) {
$dir = '.';
}
if (@is_file($file = $dir.\DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === \DIRECTORY_SEPARATOR || @is_executable($file))) {
return $file;
}
Expand Down
21 changes: 21 additions & 0 deletions src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ public function testFindWithOpenBaseDir()
}
}

/**
* @runInSeparateProcess
*/
public function testFindBatchExecutableOnWindows()
{
if (\ini_get('open_basedir')) {
Expand Down Expand Up @@ -138,6 +141,24 @@ public function testFindBatchExecutableOnWindows()
$this->assertSamePath($target.'.BAT', $result);
}

/**
* @runInSeparateProcess
*/
public function testEmptyDirInPath()
{
putenv(sprintf('PATH=%s:', \dirname(\PHP_BINARY)));

touch('executable');
chmod('executable', 0700);

$finder = new ExecutableFinder();
$result = $finder->find('executable');

$this->assertSame('./executable', $result);

unlink('executable');
}

private function assertSamePath($expected, $tested)
{
if ('\\' === \DIRECTORY_SEPARATOR) {
Expand Down
0