Mercurial > dovecot > core-2.2
changeset 12299:7b47c5a321b9
acl: Fixed memory leaks.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Mon, 18 Oct 2010 16:07:17 +0100 |
parents | 94608c2debe2 |
children | 0dae63c1af96 |
files | src/plugins/acl/acl-mailbox-list.c src/plugins/acl/acl-mailbox.c |
diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugins/acl/acl-mailbox-list.c Mon Oct 18 15:38:58 2010 +0100 +++ b/src/plugins/acl/acl-mailbox-list.c Mon Oct 18 16:07:17 2010 +0100 @@ -494,6 +494,14 @@ return alist->module_ctx.super.create_mailbox_dir(list, name, type); } +static void acl_mailbox_list_deinit(struct mailbox_list *list) +{ + struct acl_mailbox_list *alist = ACL_LIST_CONTEXT(list); + + acl_backend_deinit(&alist->rights.backend); + alist->module_ctx.super.deinit(list); +} + static void acl_mailbox_list_init_shared(struct mailbox_list *list) { struct acl_mailbox_list *alist; @@ -502,6 +510,7 @@ alist = p_new(list->pool, struct acl_mailbox_list, 1); alist->module_ctx.super = *v; list->vlast = &alist->module_ctx.super; + v->deinit = acl_mailbox_list_deinit; v->iter_init = acl_mailbox_list_iter_init_shared; MODULE_CONTEXT_SET(list, acl_mailbox_list_module, alist); @@ -534,6 +543,7 @@ alist = p_new(list->pool, struct acl_mailbox_list, 1); alist->module_ctx.super = *v; list->vlast = &alist->module_ctx.super; + v->deinit = acl_mailbox_list_deinit; v->iter_init = acl_mailbox_list_iter_init; v->iter_next = acl_mailbox_list_iter_next; v->iter_deinit = acl_mailbox_list_iter_deinit;
--- a/src/plugins/acl/acl-mailbox.c Mon Oct 18 15:38:58 2010 +0100 +++ b/src/plugins/acl/acl-mailbox.c Mon Oct 18 16:07:17 2010 +0100 @@ -510,10 +510,10 @@ abox = p_new(box->pool, struct acl_mailbox, 1); abox->module_ctx.super = *v; box->vlast = &abox->module_ctx.super; - abox->aclobj = acl_object_init_from_name(alist->rights.backend, - mailbox_get_name(box)); if ((box->flags & MAILBOX_FLAG_IGNORE_ACLS) == 0) { + abox->aclobj = acl_object_init_from_name(alist->rights.backend, + mailbox_get_name(box)); abox->acl_enabled = TRUE; v->is_readonly = acl_is_readonly; v->allow_new_keywords = acl_allow_new_keywords;