From: "martin f. krafft" <madduck@madduck.net>
To: notmuch@notmuchmail.org
Date: Tue,  2 Mar 2010 16:31:28 +0100
Message-Id: <1267543888-18134-1-git-send-email-madduck@madduck.net>
Cc: "martin f. krafft" <madduck@madduck.net>
Subject: [notmuch] [PATCH] Do not segfault on empty mime parts
Precedence: list

notmuch previously unconditionally checked mime parts for various
properties, but not for NULL, which is the case if libgmime encounters
an empty mime part.

Upon encounter of an empty mime part, the following is printed to
stderr (the second line due to my patch):

  (process:17197): gmime-CRITICAL **: g_mime_message_get_mime_part: assertion `GMIME_IS_MESSAGE (message)' failed
  Warning: Not indexing empty mime part.

This is probably a bug that should get addressed in libgmime, but for
not, my patch is an acceptable workaround.

Signed-off-by: martin f. krafft <madduck@madduck.net>
---
 lib/index.cc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/lib/index.cc b/lib/index.cc
index cf93025..0d6640b 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -336,6 +336,11 @@ _index_mime_part (notmuch_message_t *message,
     GMimeContentDisposition *disposition;
     char *body;
 
+    if (! part) {
+	fprintf (stderr, "Warning: Not indexing empty mime part.\n");
+	return;
+    }
+
     if (GMIME_IS_MULTIPART (part)) {
 	GMimeMultipart *multipart = GMIME_MULTIPART (part);
 	int i;
-- 
1.7.0