From 2b8f033bcbd5581ff7b27b396f308b77058c09dc Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 23 Feb 2014 08:20:43 -0500
Subject: [PATCH] Improvement in handling invalid email address strings
---
tests/Framework/Mime.php | 3 +++
program/lib/Roundcube/rcube_mime.php | 4 ++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 55b70f6..091b2fa 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -366,6 +366,9 @@
$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 @@
if (!$address && $name) {
$address = $name;
+ $name = '';
}
if ($address) {
diff --git a/tests/Framework/Mime.php b/tests/Framework/Mime.php
index d767905..d47eba8 100644
--- a/tests/Framework/Mime.php
+++ b/tests/Framework/Mime.php
@@ -42,6 +42,8 @@
// 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 @@
// 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) {
--
Gitblit v1.9.1