lib-storage: Mailbox index list rebuild - Add mailboxes in separate data stack frames

diff --git a/src/lib-storage/list/mail-storage-list-index-rebuild.c b/src/lib-storage/list/mail-storage-list-index-rebuild.c
index 20873929e536b9f0668b188d92561f9c4d46e023..dd0f3ec4a2a447f48436e2a31194ed2f8dd81cef 100644 (file)
--- a/src/lib-storage/list/mail-storage-list-index-rebuild.c
+++ b/src/lib-storage/list/mail-storage-list-index-rebuild.c
@@ -445,7 +445,7 @@ static int mail_storage_list_index_add_missing(struct mail_storage_list_index_re
        e_debug(ctx->storage->event, "Sorting mailbox tree");
        struct mailbox_tree_context *tree =
                mailbox_tree_init_size(sep, sizeof(struct mailbox_sort_node));
-       while (hash_table_iterate(iter, ctx->mailboxes, &key, &box)) {
+       while (hash_table_iterate(iter, ctx->mailboxes, &key, &box)) T_BEGIN {
                bool created;
                const char *name = box->index_name;
                if (name == NULL)
@@ -456,7 +456,7 @@ static int mail_storage_list_index_add_missing(struct mail_storage_list_index_re
                struct mailbox_sort_node *node =
                        container_of(_node, struct mailbox_sort_node, node);
                node->box = box;
-       }
+       } T_END;
        hash_table_iterate_deinit(&iter);
 
        mailbox_tree_sort(tree);