bug #47329 Email image parts: regex for single closing quote (rr-it)

fabpot · fabpot · commit f91c198a1a3a · 2022-08-19T15:33:20.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- Email image parts: regex for single closing quote | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - The regex for image src matches for single and double opening quotes: `([\'"])` The corresponding matching for non-closing characters is implemented for double quotes only: `([^"]+)` This change adds a non-greedy regex `.+?` which matches for as few characters as possbile before the "correspondingly matched opening quote" `\\1` appears. Commits ------- 57c49b4 Email image parts: regex for single closing quote
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -503,7 +503,7 @@ private function prepareParts(): ?array
                 $html = stream_get_contents($html);
             }
             $htmlPart = new TextPart($html, $this->htmlCharset, 'html');
-            preg_match_all('(<img\s+[^>]*src\s*=\s*(?:([\'"])cid:([^"]+)\\1|cid:([^>\s]+)))i', $html, $names);
+            preg_match_all('(<img\s+[^>]*src\s*=\s*(?:([\'"])cid:(.+?)\\1|cid:([^>\s]+)))i', $html, $names);
             $names = array_filter(array_unique(array_merge($names[2], $names[3])));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ private function prepareParts(): ?array`
`503`	`503`	`$html = stream_get_contents($html);`
`504`	`504`	`}`
`505`	`505`	`$htmlPart = new TextPart($html, $this->htmlCharset, 'html');`
`506`		`- preg_match_all('(<img\s+[^>]src\s=\s*(?:([\'"])cid:([^"]+)\\1\|cid:([^>\s]+)))i', $html, $names);`
	`506`	`+ preg_match_all('(<img\s+[^>]src\s=\s*(?:([\'"])cid:(.+?)\\1\|cid:([^>\s]+)))i', $html, $names);`
`507`	`507`	`$names = array_filter(array_unique(array_merge($names[2], $names[3])));`
`508`	`508`	`}`
`509`	`509`