diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-06-18 22:52:49 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-06-18 22:52:49 +0800 |
| commit | 2cd604b86b271519d0b6ef511bc80b8d03e5cfa5 (patch) | |
| tree | 13ac92fce9c082e530ea369484cf287c26430f8b | |
| parent | 9840648ed32492f8d21e7c6de18e5b1b7d0d88d9 (diff) | |
| download | gsoc2013-evolution-2cd604b86b271519d0b6ef511bc80b8d03e5cfa5.tar gsoc2013-evolution-2cd604b86b271519d0b6ef511bc80b8d03e5cfa5.tar.gz gsoc2013-evolution-2cd604b86b271519d0b6ef511bc80b8d03e5cfa5.tar.bz2 gsoc2013-evolution-2cd604b86b271519d0b6ef511bc80b8d03e5cfa5.tar.lz gsoc2013-evolution-2cd604b86b271519d0b6ef511bc80b8d03e5cfa5.tar.xz gsoc2013-evolution-2cd604b86b271519d0b6ef511bc80b8d03e5cfa5.tar.zst gsoc2013-evolution-2cd604b86b271519d0b6ef511bc80b8d03e5cfa5.zip | |
Bug 731604 - Recursive inline-PGP-signed text not shown properly
| -rw-r--r-- | em-format/e-mail-parser-inlinepgp-encrypted.c | 4 | ||||
| -rw-r--r-- | em-format/e-mail-parser-inlinepgp-signed.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c index 9bcd60daf1..30c437734a 100644 --- a/em-format/e-mail-parser-inlinepgp-encrypted.c +++ b/em-format/e-mail-parser-inlinepgp-encrypted.c @@ -60,9 +60,7 @@ empe_inlinepgp_encrypted_parse (EMailParserExtension *extension, GList *head, *link; GError *local_error = NULL; - if (g_cancellable_is_cancelled (cancellable) || - /* avoid recursion */ - (part_id->str && part_id->len > 20 && g_str_has_suffix (part_id->str, ".inlinepgp_encrypted"))) + if (g_cancellable_is_cancelled (cancellable)) return FALSE; cipher = camel_gpg_context_new (e_mail_parser_get_session (parser)); diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c index e34928a44f..d8620d33e9 100644 --- a/em-format/e-mail-parser-inlinepgp-signed.c +++ b/em-format/e-mail-parser-inlinepgp-signed.c @@ -65,9 +65,7 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension, GError *local_error = NULL; GByteArray *ba; - if (g_cancellable_is_cancelled (cancellable) || - /* avoid recursion */ - (part_id->str && part_id->len > 17 && g_str_has_suffix (part_id->str, ".inlinepgp_signed"))) + if (g_cancellable_is_cancelled (cancellable)) return FALSE; cipher = camel_gpg_context_new (e_mail_parser_get_session (parser)); |