bug #57284 [Mime] Fix TextPart using an unknown File (fabpot)

fabpot · fabpot · commit c3facf10a51a · 2024-06-02T17:44:33.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Mime] Fix TextPart using an unknown File | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Issues | Fix #57258  | License | MIT Commits ------- a6c8963 [Mime] Fix TextPart using an unknown File
diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Component/Mime/Part/TextPart.php
@@ -123,7 +123,11 @@ public function getName(): ?string
     public function getBody(): string
     {
         if ($this->body instanceof File) {
-            return file_get_contents($this->body->getPath());
+            if (false === $ret = @file_get_contents($this->body->getPath())) {
+                throw new InvalidArgumentException(error_get_last()['message']);
+            }
+
+            return $ret;
         }
 
         if (null === $this->seekable) {
diff --git a/src/Symfony/Component/Mime/Tests/Part/TextPartTest.php b/src/Symfony/Component/Mime/Tests/Part/TextPartTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Mime\Tests\Part;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mime\Exception\InvalidArgumentException;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Header\ParameterizedHeader;
 use Symfony\Component\Mime\Header\UnstructuredHeader;
@@ -55,6 +56,16 @@ public function testConstructorWithFile()
         $this->assertSame('content', implode('', iterator_to_array($p->bodyToIterable())));
     }
 
+    public function testConstructorWithUnknownFile()
+    {
+        $p = new TextPart(new File(\dirname(__DIR__).'/Fixtures/unknown.txt'));
+
+        // Exception should be thrown only when the body is accessed
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessageMatches('{Failed to open stream}');
+        $p->getBody();
+    }
+
     public function testConstructorWithNonStringOrResource()
     {
         $this->expectException(\TypeError::class);

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,11 @@ public function getName(): ?string`
`123`	`123`	`public function getBody(): string`
`124`	`124`	`{`
`125`	`125`	`if ($this->body instanceof File) {`
`126`		`- return file_get_contents($this->body->getPath());`
	`126`	`+ if (false === $ret = @file_get_contents($this->body->getPath())) {`
	`127`	`+ throw new InvalidArgumentException(error_get_last()['message']);`
	`128`	`+ }`
	`129`	`+`
	`130`	`+ return $ret;`
`127`	`131`	`}`
`128`	`132`
`129`	`133`	`if (null === $this->seekable) {`