From c40ec9cdab6be30a18c30c46d18c4285ba249ad2 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 29 Oct 2024 21:56:12 +0100
Subject: [PATCH] [Process] Fix handling empty path found in the PATH env var
 with ExecutableFinder

---
 .../Component/Process/ExecutableFinder.php    |  3 +++
 .../Process/Tests/ExecutableFinderTest.php    | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
index 6dc00b7c2e5db..45d91e4a0515d 100644
--- a/src/Symfony/Component/Process/ExecutableFinder.php
+++ b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -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;
                 }
diff --git a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
index a1b8d6d54b940..c4876e471b351 100644
--- a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
+++ b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
@@ -111,6 +111,9 @@ public function testFindWithOpenBaseDir()
         }
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testFindBatchExecutableOnWindows()
     {
         if (\ini_get('open_basedir')) {
@@ -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) {