[Mime] Fix memory leak

fabpot · fabpot · commit 3fa982cc8dde · 2023-10-06T15:59:44.000+02:00
diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php
@@ -30,14 +30,12 @@ public function __construct($message)
 
     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);
+        $str = '';
+        foreach ($this->toIterable() as $chunk) {
+            $str .= $chunk;
         }
 
-        return $this->message = implode('', $this->message);
+        return $str;
     }
 
     public function toIterable(): iterable
@@ -48,12 +46,19 @@ public function toIterable(): iterable
             return;
         }
 
-        $message = '';
-        foreach ($this->message as $chunk) {
-            $message .= $chunk;
-            yield $chunk;
+        if ($this->message instanceof \Generator) {
+            $message = '';
+            foreach ($this->message as $chunk) {
+                $message .= $chunk;
+                yield $chunk;
+            }
+
+            $this->message = $message;
+        } else {
+            foreach ($this->message as $chunk) {
+                yield $chunk;
+            }
         }
-        $this->message = $message;
     }
 
     /**
diff --git a/src/Symfony/Component/Mime/Tests/RawMessageTest.php b/src/Symfony/Component/Mime/Tests/RawMessageTest.php
@@ -29,26 +29,24 @@ public function testToString($messageParameter)
         $this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
     }
 
+    /**
+     * @dataProvider provideMessages
+     */
+    public function testSerialization($messageParameter)
+    {
+        $message = new RawMessage($messageParameter);
+        $this->assertEquals('some string', unserialize(serialize($message))->toString());
+        // calling methods more than once work
+        $this->assertEquals('some string', unserialize(serialize($message))->toString());
+    }
+
     public static function provideMessages(): array
     {
         return [
             'string' => ['some string'],
             'traversable' => [new \ArrayObject(['some', ' ', 'string'])],
             'array' => [['some', ' ', 'string']],
+            'generator' => [(function () { yield 'some'; yield ' '; yield 'string'; })()],
         ];
     }
-
-    public function testSerialization()
-    {
-        $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());
-    }
 }
