diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-09 20:12:34 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-09 20:12:34 -0300 |
| commit | 69a39f836bbdd4ac19b304d2a39529676fe227ca (patch) | |
| tree | c58c76715589bb27a30716277ef03f16a8a0d426 /mail | |
| parent | 9cbc3dbef54c3c8ba1fa4a35bfd261e877a65f35 (diff) | |
| parent | ae17b3b8d4b032e7fd09f2f99553296ad8eb3876 (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/bug/walk_check_for_none' into develop
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/changes/bug_4933_check_for_none | 1 | ||||
| -rw-r--r-- | mail/src/leap/mail/walk.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mail/changes/bug_4933_check_for_none b/mail/changes/bug_4933_check_for_none new file mode 100644 index 00000000..33f3bd52 --- /dev/null +++ b/mail/changes/bug_4933_check_for_none @@ -0,0 +1 @@ + o Check for none in payload detection. Closes: #4933 diff --git a/mail/src/leap/mail/walk.py b/mail/src/leap/mail/walk.py index 820b8c77..dc13345d 100644 --- a/mail/src/leap/mail/walk.py +++ b/mail/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)) """ |