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:00:34 +0200
commit10141cd6fd94105c757a0b91f11897cc5ae2c808 (patch)
tree10d89405232b4920537c2b3e81bc7a82ad7b8803 /program/steps/mail
parent4bb0bffefe3d0772f10bfd4acc3e8ccb1193211d (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 4d6627393..cad113f68 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -24,7 +24,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]+/',