lib-storage: Don't crash fetching body.snippet when multipart/alternative part has...

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index 1c37e74afa36ff8aa02fb8a2903442948f80fcc0..4fd51ee4406b7870621bbd03a6bf2680727b01f6 100644 (file)
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -905,8 +905,10 @@ index_mail_find_first_text_mime_part(struct message_part *parts)
 
                        i_assert(sub_body_data != NULL);
 
-                       if (strcasecmp(sub_body_data->content_type, "\"text\"") == 0) {
-                               if (strcasecmp(sub_body_data->content_subtype, "\"plain\"") == 0)
+                       if (sub_body_data->content_type == NULL ||
+                           strcasecmp(sub_body_data->content_type, "\"text\"") == 0) {
+                               if (sub_body_data->content_subtype == NULL ||
+                                   strcasecmp(sub_body_data->content_subtype, "\"plain\"") == 0)
                                        return part;
                                if (strcasecmp(sub_body_data->content_subtype, "\"html\"") == 0)
                                        html_part = part;