From fd0fd3b0a0c82a1a5cce4dc775886154e9bf9e14 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 10 May 2013 09:35:24 +0200
Subject: Fix handling of invalid email addresses in headers (#1489092)

---
 program/lib/Roundcube/rcube_mime.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'program/lib/Roundcube/rcube_mime.php')

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;
             }
-- 
cgit v1.2.3