Keep mail_search_args referenced during searches.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index f07d4706bcb13cf6b7a264dcd10da5875dad45f1..a36138a8ffa1a611f8985eaec81dc7207fef2454 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -634,6 +634,7 @@ mailbox_search_init(struct mailbox_transaction_context *t,
                    struct mail_search_args *args,
                    const enum mail_sort_type *sort_program)
 {
+       mail_search_args_ref(args);
        mail_search_args_simplify(args->args);
        return t->box->v.search_init(t, args, sort_program);
 }
@@ -641,9 +642,13 @@ mailbox_search_init(struct mailbox_transaction_context *t,
 int mailbox_search_deinit(struct mail_search_context **_ctx)
 {
        struct mail_search_context *ctx = *_ctx;
+       struct mail_search_args *args = ctx->args;
+       int ret;
 
        *_ctx = NULL;
-       return ctx->transaction->box->v.search_deinit(ctx);
+       ret = ctx->transaction->box->v.search_deinit(ctx);
+       mail_search_args_unref(&args);
+       return ret;
 }
 
 int mailbox_search_next(struct mail_search_context *ctx, struct mail *mail)