diff options
| author | Milan Crha <mcrha@redhat.com> | 2013-11-15 16:06:57 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2013-11-15 16:06:57 +0800 |
| commit | 570c6374806d0f1ec59cf7a72543efe6b5b637be (patch) | |
| tree | c5390b1fcb73f30c28bf37168add9bf1dc622b42 /em-format/e-mail-formatter-quote-attachment.c | |
| parent | 1be51f232560f864ba8795a38e55d472b5b0e2b3 (diff) | |
| download | gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.gz gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.bz2 gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.lz gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.xz gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.zst gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.zip | |
Fix/mute issues found by Coverity scan
This makes the code free of Coverity scan issues.
It is sometimes quite pedantic and expects/suggests some
coding habits, thus certain changes may look weird, but for a good
thing, I hope. The code is also tagged with Coverity scan
suppressions, to keep the code as is and hide the warning too.
Also note that Coverity treats g_return_if_fail(), g_assert() and
similar macros as unreliable, and it's true these can be disabled
during the compile time, thus it brings in other set of 'weird'
changes.
Diffstat (limited to 'em-format/e-mail-formatter-quote-attachment.c')
| -rw-r--r-- | em-format/e-mail-formatter-quote-attachment.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/em-format/e-mail-formatter-quote-attachment.c b/em-format/e-mail-formatter-quote-attachment.c index 1a6b19408c..81a2a15c10 100644 --- a/em-format/e-mail-formatter-quote-attachment.c +++ b/em-format/e-mail-formatter-quote-attachment.c @@ -63,7 +63,7 @@ emfqe_attachment_format (EMailFormatterExtension *extension, empa = E_MAIL_PART_ATTACHMENT (part); - if (!empa->attachment_view_part_id) + if (!empa || !empa->attachment_view_part_id) return FALSE; attachment_view_part = e_mail_part_list_ref_part ( @@ -78,7 +78,8 @@ emfqe_attachment_format (EMailFormatterExtension *extension, mime_part = e_mail_part_ref_mime_part (part); text = e_mail_part_describe ( mime_part, - empa ? empa->snoop_mime_type : + empa->snoop_mime_type && *empa->snoop_mime_type ? + empa->snoop_mime_type : e_mail_part_get_mime_type (part)); g_object_unref (mime_part); |