Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Email image parts: regex for single closing quote #47329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Email image parts: regex for single closing quote
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.
  • Loading branch information
rr-it authored Aug 18, 2022
commit 57c49b4e1305c17c4f0d1d50b31784836c22bf87
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/Mime/Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -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])));
}

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.