lib-mail: If message_part_data.content_type is set, make sure content_subtype isn...

This fixes a crash in index_mail_find_first_text_mime_part() where snippet
generation assumed that content_subtype isn't NULL.

diff --git a/src/lib-mail/message-part-data.c b/src/lib-mail/message-part-data.c
index ffae458f55af1427ffdd139fed54f4d1f22a2f8e..1c7ca9c3e57634df02b1ead8828216a04aea38ce 100644 (file)
--- a/src/lib-mail/message-part-data.c
+++ b/src/lib-mail/message-part-data.c
@@ -320,6 +320,12 @@ parse_content_type(struct message_part_data *data,
        }
        str_truncate(str, i);
        data->content_type = p_strdup(pool, str_c(str));
+       if (data->content_subtype == NULL) {
+               /* The Content-Type is invalid. Don't leave it NULL so that
+                  callers can assume that if content_type != NULL,
+                  content_subtype != NULL also. */
+               data->content_subtype = p_strdup(pool, "");
+       }
 
        if (ret < 0) {
                /* Content-Type is broken, but we wanted to get it as well as