aboutsummaryrefslogtreecommitdiffstats
path: root/em-format/e-mail-parser-inlinepgp-signed.c
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2013-01-11 03:29:50 +0800
committerMilan Crha <mcrha@redhat.com>2013-01-11 03:31:01 +0800
commit9468fc2f6b7f2c689dc35f7617b4a91d1bb04993 (patch)
treec5bb2a4868063b7e71529bd9532fab6eb3b91c83 /em-format/e-mail-parser-inlinepgp-signed.c
parentb1ed35f70d09601717e32eb5c762f79908b0bcf8 (diff)
downloadgsoc2013-evolution-9468fc2f6b7f2c689dc35f7617b4a91d1bb04993.tar
gsoc2013-evolution-9468fc2f6b7f2c689dc35f7617b4a91d1bb04993.tar.gz
gsoc2013-evolution-9468fc2f6b7f2c689dc35f7617b4a91d1bb04993.tar.bz2
gsoc2013-evolution-9468fc2f6b7f2c689dc35f7617b4a91d1bb04993.tar.lz
gsoc2013-evolution-9468fc2f6b7f2c689dc35f7617b4a91d1bb04993.tar.xz
gsoc2013-evolution-9468fc2f6b7f2c689dc35f7617b4a91d1bb04993.tar.zst
gsoc2013-evolution-9468fc2f6b7f2c689dc35f7617b4a91d1bb04993.zip
Be more strict in inline PGP mime filter/part parser
Diffstat (limited to 'em-format/e-mail-parser-inlinepgp-signed.c')
-rw-r--r--em-format/e-mail-parser-inlinepgp-signed.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c
index 2b11d6e412..fb65e5c447 100644
--- a/em-format/e-mail-parser-inlinepgp-signed.c
+++ b/em-format/e-mail-parser-inlinepgp-signed.c
@@ -66,6 +66,11 @@ 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")))
+ return FALSE;
+
cipher = camel_gpg_context_new (e_mail_parser_get_session (parser));
/* Verify the signature of the message */