maildir: Having a lot of keywords assert-crashed with "stack frame changed".

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/maildir/maildir-sync-index.c b/src/lib-storage/index/maildir/maildir-sync-index.c
index 68fc3c88c417f5696c549fece1d37f42df80ecc6..dbed50ad89d0edbccf6437dff74de0699f86a3dd 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-sync-index.c
+++ b/src/lib-storage/index/maildir/maildir-sync-index.c
@@ -478,8 +478,8 @@ int maildir_sync_index(struct maildir_index_sync_context *ctx,
        time_before_sync = time(NULL);
        mbox->syncing_commit = TRUE;
        seq = prev_uid = 0; first_recent_uid = I_MAX(hdr->first_recent_uid, 1);
-       t_array_init(&ctx->keywords, MAILDIR_MAX_KEYWORDS);
-       t_array_init(&ctx->idx_keywords, MAILDIR_MAX_KEYWORDS);
+       i_array_init(&ctx->keywords, MAILDIR_MAX_KEYWORDS);
+       i_array_init(&ctx->idx_keywords, MAILDIR_MAX_KEYWORDS);
        iter = maildir_uidlist_iter_init(mbox->uidlist);
        while (maildir_uidlist_iter_next(iter, &uid, &uflags, &filename)) {
                maildir_filename_get_flags(ctx->keywords_sync_ctx, filename,
@@ -662,6 +662,8 @@ int maildir_sync_index(struct maildir_index_sync_context *ctx,
                        offsetof(struct mail_index_header, first_recent_uid),
                        &first_recent_uid, sizeof(first_recent_uid), FALSE);
        }
+       array_free(&ctx->keywords);
+       array_free(&ctx->idx_keywords);
        return ret < 0 ? -1 : (full_rescan ? 0 : 1);
 }