X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-index-message.cc;h=0b1072d759c481af6a8fd3812c5bf193c99dce91;hp=4585a3b98905d03d44252f7a88d55b2c06f76f23;hb=71bd250cb6200e9a89768e34562938f7fe409d4b;hpb=bae1ce09a37071cdf592048938319c72653e96e0

diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 4585a3b9..0b1072d7 100644
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -204,6 +204,9 @@ gen_terms_address_names (Xapian::TermGenerator term_gen,
     int i;
     InternetAddress *address;
 
+    if (addresses == NULL)
+	return;
+
     for (i = 0; i < internet_address_list_length (addresses); i++) {
 	address = internet_address_list_get_address (addresses, i);
 	gen_terms_address_name (term_gen, address, address_type);
@@ -234,6 +237,9 @@ add_terms_address_addrs (Xapian::Document doc,
     int i;
     InternetAddress *address;
 
+    if (addresses == NULL)
+	return;
+
     for (i = 0; i < internet_address_list_length (addresses); i++) {
 	address = internet_address_list_get_address (addresses, i);
 	add_term_address_addr (doc, address, address_type);
@@ -497,7 +503,8 @@ gen_terms_part (Xapian::TermGenerator term_gen,
     stream = g_mime_stream_mem_new_with_byte_array (byte_array);
     g_mime_stream_mem_set_owner (GMIME_STREAM_MEM (stream), FALSE);
     wrapper = g_mime_part_get_content_object (GMIME_PART (part));
-    g_mime_data_wrapper_write_to_stream (wrapper, stream);
+    if (wrapper)
+	g_mime_data_wrapper_write_to_stream (wrapper, stream);
 
     g_object_unref (stream);