summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-07-10 12:44:16 -0400
committerRuben Pollan <meskio@sindominio.net>2015-07-13 11:55:30 -0400
commitf8155d8fec6a16d7841f8102815cc939e68bad15 (patch)
tree98d6cf2b28d6e434418303487ed329831c902f6c
parentbaca0d3a3ab1e1cbd9e48ade3dd93f9eadbf261e (diff)
[bug] workaround for off-by-one error on nested multipart
For some reason that I haven't discovered yet, nested multipart is hitting an off-by-one error (that had been wrongly ammended in a previous commit, breaking many other cases but fixing the particular Mail.app sample I was working with). This is just a temporary hack to make all the current regression tests happy, but further investigation is needed to discover the cause of the off-by-one part retrieval solved and correctly documented.
-rw-r--r--mail/src/leap/mail/mail.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/mail/src/leap/mail/mail.py b/mail/src/leap/mail/mail.py
index 0aede6b..772b6db 100644
--- a/mail/src/leap/mail/mail.py
+++ b/mail/src/leap/mail/mail.py
@@ -211,6 +211,16 @@ class MessagePart(object):
raise TypeError
sub_pmap = self._pmap.get("part_map", {})
+
+ # XXX BUG --- workaround. Subparts with more than 1 subparts
+ # need to get the requested index for the subpart decremented.
+ # Off-by-one error, should investigate which is the real reason and
+ # fix it, this is only a quick workaround.
+ num_parts = self._pmap.get("parts", 0)
+ if num_parts > 1:
+ part = part - 1
+ # -------------------------------------------------------------
+
try:
part_map = sub_pmap[str(part)]
except KeyError: