summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-01-09 18:11:58 -0400
committerKali Kaneko <kali@leap.se>2014-01-09 18:11:58 -0400
commitbffdcddee55d1045be5d5c8378f712283863b6bf (patch)
tree533d64d92c3ecde7c65f74519ec0fc39f59b3c79
parent772df2393bb8a7efb4260da6675b6eab0d3e0a77 (diff)
check for none
-rw-r--r--changes/bug_4933_check_for_none1
-rw-r--r--src/leap/mail/walk.py6
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug_4933_check_for_none b/changes/bug_4933_check_for_none
new file mode 100644
index 0000000..33f3bd5
--- /dev/null
+++ b/changes/bug_4933_check_for_none
@@ -0,0 +1 @@
+ o Check for none in payload detection. Closes: #4933
diff --git a/src/leap/mail/walk.py b/src/leap/mail/walk.py
index 820b8c7..dc13345 100644
--- a/src/leap/mail/walk.py
+++ b/src/leap/mail/walk.py
@@ -57,11 +57,13 @@ get_payloads = lambda msg: ((x.get_payload(),
get_body_phash_simple = lambda payloads: first(
[get_hash(payload) for payload, headers in payloads
- if "text/plain" in headers.get('content-type')])
+ if payloads
+ and "text/plain" in headers.get('content-type')])
get_body_phash_multi = lambda payloads: (first(
[get_hash(payload) for payload, headers in payloads
- if "text/plain" in headers.get('content-type')])
+ if payloads
+ and "text/plain" in headers.get('content-type')])
or get_body_phash_simple(payloads))
"""