From 4efc69e7fda33f9c69285f1a4f2cd0aaac160bb3 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 23 Oct 2014 11:09:35 +0200
Subject: Fix handling of base64-encoded attachments with extra spaces
 (#1490111)

---
 program/lib/Roundcube/rcube_imap_generic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program')

diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 2690cbd5a..96173d317 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -2636,7 +2636,7 @@ class rcube_imap_generic
 
                     // BASE64
                     if ($mode == 1) {
-                        $line = rtrim($line, "\t\r\n\0\x0B");
+                        $line = preg_replace('|[^a-zA-Z0-9+=/]|', '', $line);
                         // create chunks with proper length for base64 decoding
                         $line = $prev.$line;
                         $length = strlen($line);
-- 
cgit v1.2.3