Ensure stream is cleaned before throwing transport exception

bobvandevijver · bobvandevijver · commit ee18da7710f0 · 2024-04-11T15:39:33.000+02:00
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php
@@ -57,11 +57,15 @@ public function terminate(): void
             $err = stream_get_contents($this->err);
             fclose($this->err);
             if (0 !== $exitCode = proc_close($this->stream)) {
-                throw new TransportException('Process failed with exit code '.$exitCode.': '.$out.$err);
+                $errorMessage = 'Process failed with exit code '.$exitCode.': '.$out.$err;
             }
         }
 
         parent::terminate();
+
+        if (isset($errorMessage)) {
+            throw new TransportException($errorMessage);
+        }
     }
 
     protected function getReadConnectionDescription(): string

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,15 @@ public function terminate(): void`
`57`	`57`	`$err = stream_get_contents($this->err);`
`58`	`58`	`fclose($this->err);`
`59`	`59`	`if (0 !== $exitCode = proc_close($this->stream)) {`
`60`		`- throw new TransportException('Process failed with exit code '.$exitCode.': '.$out.$err);`
	`60`	`+ $errorMessage = 'Process failed with exit code '.$exitCode.': '.$out.$err;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`parent::terminate();`
	`65`	`+`
	`66`	`+ if (isset($errorMessage)) {`
	`67`	`+ throw new TransportException($errorMessage);`
	`68`	`+ }`
`65`	`69`	`}`
`66`	`70`
`67`	`71`	`protected function getReadConnectionDescription(): string`