bug #36304 Check whether path is file in DataPart::fromPath() (freiondrej)

fabpot · fabpot · commit 030b10ca0d04 · 2020-06-22T16:55:16.000+02:00
This PR was submitted for the 5.0 branch but it was squashed and merged into the 4.4 branch instead. Discussion ---------- Check whether path is file in DataPart::fromPath() | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no Method `getBody()` uses stream_get_contents() to retrieve the body, however it fails to do so when the stream is a directory. Commits ------- 9e3670e Check whether path is file in DataPart::fromPath()
diff --git a/src/Symfony/Component/Mime/Part/DataPart.php b/src/Symfony/Component/Mime/Part/DataPart.php
@@ -56,6 +56,10 @@ public static function fromPath(string $path, string $name = null, string $conte
             $contentType = self::$mimeTypes->getMimeTypes($ext)[0] ?? 'application/octet-stream';
         }
 
+        if (false === is_readable($path)) {
+            throw new InvalidArgumentException(sprintf('Path "%s" is not readable.', $path));
+        }
+        
         if (false === $handle = @fopen($path, 'r', false)) {
             throw new InvalidArgumentException(sprintf('Unable to open path "%s".', $path));
         }

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ public static function fromPath(string $path, string $name = null, string $conte`
`56`	`56`	`$contentType = self::$mimeTypes->getMimeTypes($ext)[0] ?? 'application/octet-stream';`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ if (false === is_readable($path)) {`
	`60`	`+ throw new InvalidArgumentException(sprintf('Path "%s" is not readable.', $path));`
	`61`	`+ }`
	`62`	`+`
`59`	`63`	`if (false === $handle = @fopen($path, 'r', false)) {`
`60`	`64`	`throw new InvalidArgumentException(sprintf('Unable to open path "%s".', $path));`
`61`	`65`	`}`