[geary] Fix crash when GMime sub-message part doesn't actually contain a message.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary] Fix crash when GMime sub-message part doesn't actually contain a message.
- Date: Wed, 7 Feb 2018 06:37:46 +0000 (UTC)
commit 6c040c49b47f966196cf16e0f86253591c802480
Author: Michael James Gratton <mike vee net>
Date: Wed Feb 7 17:37:29 2018 +1100
Fix crash when GMime sub-message part doesn't actually contain a message.
Patch courtesy Oliver <ogtifs gmail com>
Bug 769697.
src/engine/rfc822/rfc822-message.vala | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/engine/rfc822/rfc822-message.vala b/src/engine/rfc822/rfc822-message.vala
index d11f612..5b6f373 100644
--- a/src/engine/rfc822/rfc822-message.vala
+++ b/src/engine/rfc822/rfc822-message.vala
@@ -943,7 +943,11 @@ public class Geary.RFC822.Message : BaseObject {
GMime.MessagePart? messagepart = root as GMime.MessagePart;
if (messagepart != null) {
GMime.Message sub_message = messagepart.get_message();
- messages.add(new Geary.RFC822.Message.from_gmime_message(sub_message));
+ if (sub_message != null) {
+ messages.add(new Geary.RFC822.Message.from_gmime_message(sub_message));
+ } else {
+ warning("Corrupt message, possibly bug 769697");
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]