summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube/rcube_message_header.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-04-06 19:28:47 +0200
committerAleksander Machniak <alec@alec.pl>2013-04-06 19:29:55 +0200
commit6f4b50abea536bd13a3dc6dde04aaee825dc8c8e (patch)
treeef2cdae615a0fc8c6f97021dcd094c34730f5857 /program/lib/Roundcube/rcube_message_header.php
parent9404f4a7a65382a26f01cf48fd9ab43ef7b1a339 (diff)
Fix handling of invalid characters in message headers and output (#1489032)
Conflicts: CHANGELOG
Diffstat (limited to 'program/lib/Roundcube/rcube_message_header.php')
-rw-r--r--program/lib/Roundcube/rcube_message_header.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_message_header.php b/program/lib/Roundcube/rcube_message_header.php
index 274ae7f9f..2c5e2b6c8 100644
--- a/program/lib/Roundcube/rcube_message_header.php
+++ b/program/lib/Roundcube/rcube_message_header.php
@@ -215,7 +215,12 @@ class rcube_message_header
$value = $this->others[$name];
}
- return $decode ? rcube_mime::decode_header($value, $this->charset) : $value;
+ if ($decode) {
+ $value = rcube_mime::decode_header($value, $this->charset);
+ $value = rcube_charset::clean($value);
+ }
+
+ return $value;
}
/**