lib-storage: Fix potential assert-crash when adding missing attachment flags

This happened only in a rather special condition. Added unit test to
reproduce it.

Fixes:
Panic: file index-mail-headers.c: line 298 (index_mail_parse_header): assertion failed: (part != NULL)

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index 61e6bfb3d85ba35966420a30d1d670d045f96f40..a3629429108b47b04acec27eac327f528e5301f5 100644 (file)
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -1412,11 +1412,18 @@ static int index_mail_parse_bodystructure(struct index_mail *mail,
                        /* we haven't parsed the header yet */
                        const char *reason =
                                index_mail_cache_reason(&mail->mail.mail, "bodystructure");
+                       bool orig_bodystructure_header =
+                               data->save_bodystructure_header;
+                       bool orig_bodystructure_body =
+                               data->save_bodystructure_body;
                        data->save_bodystructure_header = TRUE;
                        data->save_bodystructure_body = TRUE;
                        (void)get_cached_parts(mail);
                        if (index_mail_parse_headers(mail, NULL, reason) < 0) {
-                               data->save_bodystructure_header = TRUE;
+                               data->save_bodystructure_header =
+                                       orig_bodystructure_header;
+                               data->save_bodystructure_body =
+                                       orig_bodystructure_body;
                                return -1;
                        }
                        i_assert(data->parser_ctx != NULL);