aboutsummaryrefslogtreecommitdiffstats
path: root/em-format
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-25 10:46:36 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-25 10:47:21 +0800
commitca30703f70b56e91afa84ccb41ac02fbe87fd0df (patch)
treebe73d455f3135abf7f7d7719d8bd92d96e562310 /em-format
parent0beee88d1022956ef6acd5dbf9eddd5bdcd3b318 (diff)
downloadgsoc2013-evolution-ca30703f70b56e91afa84ccb41ac02fbe87fd0df.tar
gsoc2013-evolution-ca30703f70b56e91afa84ccb41ac02fbe87fd0df.tar.gz
gsoc2013-evolution-ca30703f70b56e91afa84ccb41ac02fbe87fd0df.tar.bz2
gsoc2013-evolution-ca30703f70b56e91afa84ccb41ac02fbe87fd0df.tar.lz
gsoc2013-evolution-ca30703f70b56e91afa84ccb41ac02fbe87fd0df.tar.xz
gsoc2013-evolution-ca30703f70b56e91afa84ccb41ac02fbe87fd0df.tar.zst
gsoc2013-evolution-ca30703f70b56e91afa84ccb41ac02fbe87fd0df.zip
Bug 694159 - Malformed content-type header causes infinite recursion
Diffstat (limited to 'em-format')
-rw-r--r--em-format/e-mail-formatter-attachment.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index e81f56b659..25df816186 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -269,6 +269,12 @@ emfe_attachment_format (EMailFormatterExtension *extension,
context->part_list,
empa->attachment_view_part_id);
+ /* Avoid recursion. */
+ if (attachment_view_part == part) {
+ e_mail_part_unref (attachment_view_part);
+ attachment_view_part = NULL;
+ }
+
if (attachment_view_part != NULL) {
ok = e_mail_formatter_format_as (
formatter, context,