bug #54471 [Filesystem] Strengthen the check of file permissions in dumpFile (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit e483eee99bc2 · 2024-04-04T11:19:05.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Filesystem] Strengthen the check of file permissions in `dumpFile` | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54444 | License | MIT `fileperms()` can fail and return `false`, I think we should strengthen the checks on its return value when using it to avoid undesirable behavior. Commits ------- 0c17a4e [Filesystem] Strengthen the check of file permissions in `dumpFile`
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -691,7 +691,7 @@ 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());
+            self::box('chmod', $tmpFile, @fileperms($filename) ?: 0666 & ~umask());
 
             $this->rename($tmpFile, $filename, true);
         } finally {

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,7 @@ 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`	`+ self::box('chmod', $tmpFile, @fileperms($filename) ?: 0666 & ~umask());`
`695`	`695`
`696`	`696`	`$this->rename($tmpFile, $filename, true);`
`697`	`697`	`} finally {`