Forcibly remove \0 at the end of a decoded message

This happens fairly commonly with some broken MUAs it seems.

1 files changed, 5 insertions, 0 deletions

diff --git a/loader/lib/parser.py b/loader/lib/parser.py
index 40f0a92..7e5bdc7 100644
--- a/loader/lib/parser.py
+++ b/loader/lib/parser.py
@@ -161,6 +161,11 @@ class ArchivesParser(object):
 		m = self._re_footer.match(b)
 		if m:
 			b = m.group(1)
+
+		# Sometimes we end up with a trailing \0 when decoding long strings, so
+		# replace it if it's there.
+		b = b.rstrip('\0')
+
 		return b
 
 	def _get_body(self):