Fix inconsistencies in path cleaning

Orbitale · Dec 9, 2024 · 08ad138 · 08ad138
1 parent ef89b11
commit 08ad138
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Tests/CommandTest.php b/Tests/CommandTest.php
@@ -331,11 +331,11 @@ public function testCommandString($source, $output, $geometry, $quality, $format
         ;
 
         $expected = \implode(' ', $command->getExecutable('convert')).
-                    ' '.$source.
+                    ' \''.$source.'\''.
                     ' -thumbnail "'.$geometry.'"'.
                     ' -quality '.$quality.
                     ' -page "'.$format.'"'.
-                    ' '.$output;
+                    ' \''.$output.'\'';
 
         $expected = \str_replace('\\', '/', $expected);
 

diff --git a/src/Command.php b/src/Command.php
@@ -105,7 +105,7 @@ public static function create(?string $magickBinaryPath = null): self
     public static function findMagickBinaryPath(?string $magickBinaryPath): string
     {
         // Delete trimming directory separator
-        $magickBinaryPath = self::cleanPath((string) $magickBinaryPath, true);
+        $magickBinaryPath = self::cleanPath((string) $magickBinaryPath, true, false);
 
         if (!$magickBinaryPath) {
             $magickBinaryPath = (new ExecutableFinder())->find('magick');
@@ -118,15 +118,17 @@ public static function findMagickBinaryPath(?string $magickBinaryPath): string
         return $magickBinaryPath;
     }
 
-    private static function cleanPath(string $path, bool $rtrim = false): string
+    private static function cleanPath(string $path, bool $rtrim = false, bool $escape = true): string
     {
         $path = \str_replace('\\', '/', $path);
 
         if ($rtrim) {
             $path = \rtrim($path, '/');
         }
 
-        $path = \escapeshellarg($path);
+        if ($escape) {
+            $path = \escapeshellarg($path);
+        }
 
         return $path;
     }