bug #51874 [Mime] Fix memory leak (fabpot)

fabpot · fabpot · commit d6c879747d19 · 2023-10-10T08:10:08.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Mime] Fix memory leak | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #51764 | License | MIT Commits ------- ee81ae4 [Mime] Fix memory leak
diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php
@@ -30,11 +30,13 @@ public function toString(): string
         if (\is_string($this->message)) {
             return $this->message;
         }
-        if ($this->message instanceof \Traversable) {
-            $this->message = iterator_to_array($this->message, false);
+
+        $message = '';
+        foreach ($this->message as $chunk) {
+            $message .= $chunk;
         }
 
-        return $this->message = implode('', $this->message);
+        return $this->message = $message;
     }
 
     public function toIterable(): iterable
@@ -45,12 +47,9 @@ public function toIterable(): iterable
             return;
         }
 
-        $message = '';
         foreach ($this->message as $chunk) {
-            $message .= $chunk;
             yield $chunk;
         }
-        $this->message = $message;
     }
 
     /**
diff --git a/src/Symfony/Component/Mime/Tests/RawMessageTest.php b/src/Symfony/Component/Mime/Tests/RawMessageTest.php
@@ -19,36 +19,40 @@ class RawMessageTest extends TestCase
     /**
      * @dataProvider provideMessages
      */
-    public function testToString($messageParameter)
+    public function testToString(mixed $messageParameter, bool $supportReuse)
     {
         $message = new RawMessage($messageParameter);
         $this->assertEquals('some string', $message->toString());
         $this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
-        // calling methods more than once work
-        $this->assertEquals('some string', $message->toString());
-        $this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
+
+        if ($supportReuse) {
+            // calling methods more than once work
+            $this->assertEquals('some string', $message->toString());
+            $this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
+        }
     }
 
-    public static function provideMessages(): array
+    /**
+     * @dataProvider provideMessages
+     */
+    public function testSerialization(mixed $messageParameter, bool $supportReuse)
     {
-        return [
-            'string' => ['some string'],
-            'traversable' => [new \ArrayObject(['some', ' ', 'string'])],
-            'array' => [['some', ' ', 'string']],
-        ];
+        $message = new RawMessage($messageParameter);
+        $this->assertEquals('some string', unserialize(serialize($message))->toString());
+
+        if ($supportReuse) {
+            // calling methods more than once work
+            $this->assertEquals('some string', unserialize(serialize($message))->toString());
+        }
     }
 
-    public function testSerialization()
+    public static function provideMessages(): array
     {
-        $message = new RawMessage('string');
-        $this->assertEquals('string', unserialize(serialize($message))->toString());
-        // calling methods more than once work
-        $this->assertEquals('string', unserialize(serialize($message))->toString());
-
-        $message = new RawMessage(new \ArrayObject(['some', ' ', 'string']));
-        $message = new RawMessage($message->toIterable());
-        $this->assertEquals('some string', unserialize(serialize($message))->toString());
-        // calling methods more than once work
-        $this->assertEquals('some string', unserialize(serialize($message))->toString());
+        return [
+            'string' => ['some string', true],
+            'traversable' => [new \ArrayObject(['some', ' ', 'string']), true],
+            'array' => [['some', ' ', 'string'], true],
+            'generator' => [(function () { yield 'some'; yield ' '; yield 'string'; })(), false],
+        ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,13 @@ public function toString(): string`
`30`	`30`	`if (\is_string($this->message)) {`
`31`	`31`	`return $this->message;`
`32`	`32`	`}`
`33`		`- if ($this->message instanceof \Traversable) {`
`34`		`- $this->message = iterator_to_array($this->message, false);`
	`33`	`+`
	`34`	`+ $message = '';`
	`35`	`+ foreach ($this->message as $chunk) {`
	`36`	`+ $message .= $chunk;`
`35`	`37`	`}`
`36`	`38`
`37`		`- return $this->message = implode('', $this->message);`
	`39`	`+ return $this->message = $message;`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`public function toIterable(): iterable`
`@@ -45,12 +47,9 @@ public function toIterable(): iterable`
`45`	`47`	`return;`
`46`	`48`	`}`
`47`	`49`
`48`		`- $message = '';`
`49`	`50`	`foreach ($this->message as $chunk) {`
`50`		`- $message .= $chunk;`
`51`	`51`	`yield $chunk;`
`52`	`52`	`}`
`53`		`- $this->message = $message;`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`/**`