imapc: Fix leaking mail_index_view on delayed expunge handling

Fixes:
Panic: Leaked view for index (in-memory index): Opened in imapc-mailbox.c:47

diff --git a/src/lib-storage/index/imapc/imapc-mailbox.c b/src/lib-storage/index/imapc/imapc-mailbox.c
index 5a18b899adcfc6abba7119883cd58fb8c801b08d..72053db3de82d97aa66538aaf9022c381dcf0d85 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-mailbox.c
+++ b/src/lib-storage/index/imapc/imapc-mailbox.c
@@ -110,15 +110,22 @@ int imapc_mailbox_commit_delayed_trans(struct imapc_mailbox *mbox,
        mbox->delayed_sync_cache_trans = NULL;
        if (mbox->delayed_sync_cache_view != NULL)
                mail_cache_view_close(&mbox->delayed_sync_cache_view);
-       if (mbox->sync_view != NULL)
-               mail_index_view_close(&mbox->sync_view);
 
        if (array_count(&mbox->delayed_expunged_uids) > 0) {
                /* delayed expunges - commit them now in a separate
-                  transaction */
+                  transaction. Reopen mbox->sync_view to see changes
+                  committed in delayed_sync_trans. */
+               if (mbox->sync_view != NULL)
+                       mail_index_view_close(&mbox->sync_view);
                if (imapc_mailbox_commit_delayed_expunges(mbox) < 0)
                        ret = -1;
        }
+
+       if (mbox->sync_view != NULL)
+               mail_index_view_close(&mbox->sync_view);
+       i_assert(mbox->delayed_sync_trans == NULL);
+       i_assert(mbox->delayed_sync_view == NULL);
+       i_assert(mbox->delayed_sync_cache_trans == NULL);
        return ret;
 }
 

diff --git a/src/lib-storage/index/imapc/imapc-sync.c b/src/lib-storage/index/imapc/imapc-sync.c
index 6637373bca00df3b7fd628a3fa64a3b8eed05e18..23b67dea9486a72c39787473c2b774ddb19964c2 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-sync.c
+++ b/src/lib-storage/index/imapc/imapc-sync.c
@@ -563,6 +563,7 @@ imapc_sync_begin(struct imapc_mailbox *mbox,
                return ret;
        }
 
+       i_assert(mbox->sync_view == NULL);
        i_assert(mbox->delayed_sync_trans == NULL);
        mbox->sync_view = ctx->sync_view;
        mbox->delayed_sync_view =