lib-storage: Reduce data stack usage when finding attachment flags from mails with...

diff --git a/src/lib-storage/mail.c b/src/lib-storage/mail.c
index 74f1e1a489cf6c835ae8a203ffaf77e9e4351883..170b2edffbd67d017d86a3d563d6037b20fa1a87 100644 (file)
--- a/src/lib-storage/mail.c
+++ b/src/lib-storage/mail.c
@@ -588,13 +588,13 @@ static bool
 mail_message_has_attachment(struct message_part *part,
                            const struct message_part_attachment_settings *set)
 {
-       for (; part != NULL; part = part->next) {
-               if (message_part_is_attachment(part, set) ||
-                   mail_message_has_attachment(part->children, set))
-                       return TRUE;
-       }
+       bool has_attachment = FALSE;
+       for (; part != NULL && !has_attachment; part = part->next) T_BEGIN {
+               has_attachment = message_part_is_attachment(part, set) ||
+                       mail_message_has_attachment(part->children, set);
+       } T_END;
 
-       return FALSE;
+       return has_attachment;
 }
 
 bool mail_has_attachment_keywords(struct mail *mail)