From 4fdaa02ac724e597479a4a48388a8a10101000fd Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 6 Apr 2013 19:28:47 +0200 Subject: Fix handling of invalid characters in message headers and output (#1489032) --- program/lib/Roundcube/rcube_message_header.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'program/lib/Roundcube/rcube_message_header.php') 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; } /** -- cgit v1.2.3