From 9468fc2f6b7f2c689dc35f7617b4a91d1bb04993 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 10 Jan 2013 20:29:50 +0100 Subject: Be more strict in inline PGP mime filter/part parser --- em-format/e-mail-parser-inlinepgp-encrypted.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'em-format/e-mail-parser-inlinepgp-encrypted.c') diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c index 885f9151e6..624452c8b0 100644 --- a/em-format/e-mail-parser-inlinepgp-encrypted.c +++ b/em-format/e-mail-parser-inlinepgp-encrypted.c @@ -61,6 +61,11 @@ 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"))) + return FALSE; + cipher = camel_gpg_context_new (e_mail_parser_get_session (parser)); opart = camel_mime_part_new (); -- cgit v1.2.3