Fixed crashing with virtual mailboxes.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 64575a98e19f07fc41528bc27325764f651789d4..2f84bdb2a6ec67fa8de98a44a989c014e8edcbd9 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -435,6 +435,7 @@ mailbox_list_ns_iter_next(struct mailbox_list_iterate_context *_ctx)
                /* go to the next namespace */
                if (mailbox_list_iter_deinit(&ctx->backend_ctx) < 0)
                        _ctx->failed = TRUE;
+               ctx->ctx.list->ns = ctx->namespaces;
                ctx->backend_ctx =
                        mailbox_list_iter_init_multiple(ctx->namespaces->list,
                                                        ctx->patterns,
@@ -483,6 +484,7 @@ mailbox_list_iter_init_namespaces(struct mail_namespace *namespaces,
        for (i = 0; i < count; i++)
                ctx->patterns[i] = p_strdup(pool, patterns[i]);
 
+       ctx->ctx.list->ns = namespaces;
        ctx->backend_ctx = mailbox_list_iter_init_multiple(namespaces->list,
                                                           patterns, flags);
        ctx->namespaces = namespaces->next;