From 55acd92bd93bf3fe9d6f5a562703495dfc26af37 Mon Sep 17 00:00:00 2001 From: djcb Date: Thu, 18 Apr 2013 00:12:37 +0300 Subject: [PATCH] * mu: fix some valgrind reports --- lib/mu-msg-part.c | 3 ++- lib/mu-msg.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/mu-msg-part.c b/lib/mu-msg-part.c index be803c5f..d409aa53 100644 --- a/lib/mu-msg-part.c +++ b/lib/mu-msg-part.c @@ -174,7 +174,8 @@ mu_msg_part_get_text (MuMsg *msg, MuMsgPart *self, MuMsgOptions opts) gboolean err; g_return_val_if_fail (msg, NULL); - g_return_val_if_fail (self && self->data, NULL); + g_return_val_if_fail (self && GMIME_IS_OBJECT(self->data), + NULL); mobj = (GMimeObject*)self->data; diff --git a/lib/mu-msg.c b/lib/mu-msg.c index c89060a6..5630fde3 100644 --- a/lib/mu-msg.c +++ b/lib/mu-msg.c @@ -469,6 +469,9 @@ accumulate_body (MuMsg *msg, MuMsgPart *mpart, BodyData *bdata) if (mpart->part_type & MU_MSG_PART_TYPE_ATTACHMENT) return; + if (!GMIME_IS_PART(mpart->data)) + return; + txt = NULL; err = TRUE; @@ -493,7 +496,7 @@ get_body (MuMsg *self, MuMsgOptions opts, gboolean want_html) BodyData bdata; bdata.want_html = want_html; - bdata.gstr = g_string_sized_new (4096); + bdata.gstr = g_string_sized_new (4096); mu_msg_part_foreach (self, opts, (MuMsgPartForeachFunc)accumulate_body,