diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-05-10 09:35:24 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-05-10 09:35:24 +0200 |
| commit | fd0fd3b0a0c82a1a5cce4dc775886154e9bf9e14 (patch) | |
| tree | 80bd63bba4a25c7f387f0594ee07615dbbc089f9 /program/lib/Roundcube/rcube_mime.php | |
| parent | 621a2e7f1c6ea22c6fa8804f6ef3f3a876acf296 (diff) | |
Fix handling of invalid email addresses in headers (#1489092)
Diffstat (limited to 'program/lib/Roundcube/rcube_mime.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_mime.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php index 63549fbec..596828814 100644 --- a/program/lib/Roundcube/rcube_mime.php +++ b/program/lib/Roundcube/rcube_mime.php @@ -361,6 +361,11 @@ class rcube_mime $address = $m[1]; $name = ''; } + // special case (#1489092) + else if (preg_match('/(\s*<MAILER-DAEMON>)$/', $val, $m)) { + $address = 'MAILER-DAEMON'; + $name = substr($val, 0, -strlen($m[1])); + } else { $name = $val; } |