From 1d158f329ad0ec111005f685aa9ae2227131ae9b Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Tue, 19 Oct 2021 09:53:59 +0200 Subject: [PATCH] pst: account for possible failure in decoding body and possible "unicode" name for encoding --- src/filters/rclpst.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/filters/rclpst.py b/src/filters/rclpst.py index 78921e0f..36c3e671 100755 --- a/src/filters/rclpst.py +++ b/src/filters/rclpst.py @@ -135,8 +135,13 @@ class EmailBuilder(object): charset = headers.get_content_charset() body = '' if charset: - body = self.body.decode(charset, errors='replace') - #self.log("DECODE FROM HEADER CHARSET %s SUCCEEDED"% charset) + if charset == 'unicode': + charset = 'utf-16' + try: + body = self.body.decode(charset, errors='replace') + #self.log("DECODE FROM HEADER CHARSET %s SUCCEEDED"% charset) + except: + pass else: try: body = self.body.decode('utf-8')