pst: account for possible failure in decoding body and possible "unicode" name for encoding

2021-10-19 09:53:59 +02:00
parent 1f92478daf
commit 1d158f329a
1 changed files with 7 additions and 2 deletions
@@ -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')