summaryrefslogtreecommitdiff
path: root/program/include/rcube_imap.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-09-12 08:49:47 +0000
committeralecpl <alec@alec.pl>2011-09-12 08:49:47 +0000
commit66a3b034193ceef1315ab68ceaf6789ccbf882eb (patch)
tree8386a41852ae6f8ffd8b6e533f4edf456f1ed417 /program/include/rcube_imap.php
parent5f129dd05313d2d697941bc2a0afbe44c9d3a138 (diff)
- Fix handling of binary attachments encoded with quoted-printable (#1488065)
Diffstat (limited to 'program/include/rcube_imap.php')
-rw-r--r--program/include/rcube_imap.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index dfbee76c0..ce8bb0f6d 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2386,6 +2386,9 @@ class rcube_imap
return true;
}
+ // Remove NULL characters (#1486189)
+ $body = str_replace("\x00", '', $body);
+
// convert charset (if text or message part)
if ($body && !$skip_charset_conv &&
preg_match('/^(text|message)$/', $o_part->ctype_primary)