Fixed an issue with shunted messages on a list where the charset for

the list's preferred_language had been changed from iso-8859-1 to
utf-8 without recoding the list's description.

2 files changed, 10 insertions, 1 deletions

diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index 236f39f1..25fda890 100755
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -65,7 +65,12 @@ def uheader(mlist, s, header_name=None, continuation_ws='\t', maxlinelen=None):
     else:
         # there is no nonascii so ...
         charset = 'us-ascii'
-    return Header(s, charset, maxlinelen, header_name, continuation_ws)
+    try:
+        return Header(s, charset, maxlinelen, header_name, continuation_ws)
+    except UnicodeError:
+        syslog('error', 'list: %s: can\'t decode "%s" as %s',
+               mlist.internal_name(), s, charset)
+        return Header('', charset, maxlinelen, header_name, continuation_ws)
 
 def change_header(name, value, mlist, msg, msgdata, delete=True, repl=True):
     if ((msgdata.get('from_is_list') == 2 or
diff --git a/NEWS b/NEWS
index 7f40698c..cb7eb2ba 100755
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@ Here is a history of user visible changes to Mailman.
 
   Bug fixes and other patches
 
+    - Fixed an issue with shunted messages on a list where the charset for
+      the list's preferred_language had been changed from iso-8859-1 to
+      utf-8 without recoding the list's description.  (LP: #1462755)
+
     - Mailman-Postfix integration will now add mailman@domain entries in
       data/virtual-mailman for each domain in POSTFIX_STYLE_VIRTUAL_DOMAINS
       which is a host_name of a list.  This is so the addresses which are