[Filesystem] Strengthen the check of file permissions in dumpFile

alexandre-daubois · alexandre-daubois · commit 610ccffe4bcf · 2024-04-03T12:48:55.000+02:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -691,7 +691,8 @@ public function dumpFile(string $filename, $content)
                 throw new IOException(sprintf('Failed to write file "%s": ', $filename).self::$lastError, 0, null, $filename);
             }
 
-            self::box('chmod', $tmpFile, file_exists($filename) ? fileperms($filename) : 0666 & ~umask());
+            $perms = fileperms($filename);
+            self::box('chmod', $tmpFile, file_exists($filename) && false !== $perms ? $perms : 0666 & ~umask());
 
             $this->rename($tmpFile, $filename, true);
         } finally {
diff --git a/src/Symfony/Component/Mime/Tests/AbstractMimeTypeGuesserTestCase.php b/src/Symfony/Component/Mime/Tests/AbstractMimeTypeGuesserTestCase.php
@@ -116,7 +116,8 @@ public function testGuessWithNonReadablePath()
         touch($path);
         @chmod($path, 0333);
 
-        if (str_ends_with(sprintf('%o', fileperms($path)), '0333')) {
+        $perms = fileperms($path);
+        if (false !== $perms && str_ends_with(sprintf('%o', $perms), '0333')) {
             $this->expectException(\InvalidArgumentException::class);
             $this->getGuesser()->guessMimeType($path);
         } else {

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,8 @@ public function dumpFile(string $filename, $content)`
`691`	`691`	`throw new IOException(sprintf('Failed to write file "%s": ', $filename).self::$lastError, 0, null, $filename);`
`692`	`692`	`}`
`693`	`693`
`694`		`- self::box('chmod', $tmpFile, file_exists($filename) ? fileperms($filename) : 0666 & ~umask());`
	`694`	`+ $perms = fileperms($filename);`
	`695`	`+ self::box('chmod', $tmpFile, file_exists($filename) && false !== $perms ? $perms : 0666 & ~umask());`
`695`	`696`
`696`	`697`	`$this->rename($tmpFile, $filename, true);`
`697`	`698`	`} finally {`