summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-10-23 11:09:35 +0200
committerAleksander Machniak <alec@alec.pl>2014-10-23 11:09:35 +0200
commit9d9623462ab144f9013b1f7ac85667e186f6c0d8 (patch)
treef90ebed088318e9772b179077ca7f6d7b3375764 /program/lib
parent2268aa676d4f21f0f26b4c802c6fb9c2c631d206 (diff)
Fix handling of base64-encoded attachments with extra spaces (#1490111)
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_imap_generic.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 734a9311e..7c1166f5c 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -2675,7 +2675,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);