diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-02-23 14:20:43 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-02-24 14:16:10 +0100 |
| commit | 55d9d5e0b7c75d7a4a2f59a76a8fdc793bf78b43 (patch) | |
| tree | 52031853949f5fb459137261e39a33d77b28b9af | |
| parent | 5f5174e3b537a5ec87c6d7bd6cbc898a47725fd5 (diff) | |
Improvement in handling invalid email address strings
| -rw-r--r-- | program/lib/Roundcube/rcube_mime.php | 4 | ||||
| -rw-r--r-- | tests/Framework/Mime.php | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php index 55b70f67c..091b2fae8 100644 --- a/program/lib/Roundcube/rcube_mime.php +++ b/program/lib/Roundcube/rcube_mime.php @@ -366,6 +366,9 @@ class rcube_mime $address = 'MAILER-DAEMON'; $name = substr($val, 0, -strlen($m[1])); } + else if (preg_match('/('.$email_rx.')/', $val, $m)) { + $name = $m[1]; + } else { $name = $val; } @@ -387,6 +390,7 @@ class rcube_mime if (!$address && $name) { $address = $name; + $name = ''; } if ($address) { diff --git a/tests/Framework/Mime.php b/tests/Framework/Mime.php index d767905e3..d47eba896 100644 --- a/tests/Framework/Mime.php +++ b/tests/Framework/Mime.php @@ -42,6 +42,8 @@ class Framework_Mime extends PHPUnit_Framework_TestCase // invalid (#1489092) 22 => '"John Doe @ SomeBusinessName" <MAILER-DAEMON>', 23 => '=?UTF-8?B?IlRlc3QsVGVzdCI=?= <test@domain.tld>', + // invalid, but we do our best to parse correctly + 24 => '"email@test.com" <>', ); $results = array( @@ -70,6 +72,7 @@ class Framework_Mime extends PHPUnit_Framework_TestCase // invalid (#1489092) 22 => array(1, 'John Doe @ SomeBusinessName', 'MAILER-DAEMON'), 23 => array(1, 'Test,Test', 'test@domain.tld'), + 24 => array(1, '', 'email@test.com'), ); foreach ($headers as $idx => $header) { |