summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-09-03 19:00:34 +0200
committerAleksander Machniak <alec@alec.pl>2012-09-03 19:01:50 +0200
commit4b484710ee367150989cd1b939a04111b8b5a923 (patch)
tree20c7df253b2381b52f0188668959ca91e11cb5b4 /program/steps/mail
parent6c9fe3d894bd065df3e4cd16ff9f661ad7194856 (diff)
Fix displaying all headers when they contain malformed characters (#1488666)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/headers.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index 0892247f8..3bb087a59 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -26,7 +26,8 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_POST))
$source = $RCMAIL->storage->get_raw_headers($uid);
if ($source !== false) {
- $source = htmlspecialchars(trim($source));
+ $source = trim(rcube_charset::clean($source));
+ $source = htmlspecialchars($source);
$source = preg_replace(
array(
'/\n[\t\s]+/',