acl: Add and use ACL_USER_CONTEXT_REQUIRE

Satisfies static analyzers
dovecot · Feb 20, 2018 · 7536e28 · 7536e28
1 parent 86f3bd9
commit 7536e28
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/plugins/acl/acl-mailbox-list.c b/src/plugins/acl/acl-mailbox-list.c
@@ -551,14 +551,14 @@ static void acl_mailbox_list_init_default(struct mailbox_list *list)
 
 void acl_mail_namespace_storage_added(struct mail_namespace *ns)
 {
-	struct acl_user *auser = ACL_USER_CONTEXT(ns->user);
 	struct acl_mailbox_list *alist = ACL_LIST_CONTEXT(ns->list);
 	struct acl_backend *backend;
 	const char *current_username, *owner_username;
 	bool owner = TRUE;
 
 	if (alist == NULL)
 		return;
+	struct acl_user *auser = ACL_USER_CONTEXT_REQUIRE(ns->user);
 
 	owner_username = ns->user->username;
 	current_username = auser->acl_user;

diff --git a/src/plugins/acl/acl-plugin.h b/src/plugins/acl/acl-plugin.h
@@ -16,6 +16,8 @@
 	MODULE_CONTEXT_REQUIRE(obj, acl_mailbox_list_module)
 #define ACL_USER_CONTEXT(obj) \
 	MODULE_CONTEXT(obj, acl_user_module)
+#define ACL_USER_CONTEXT_REQUIRE(obj) \
+	MODULE_CONTEXT_REQUIRE(obj, acl_user_module)
 
 struct acl_user {
 	union mail_user_module_context module_ctx;

diff --git a/src/plugins/acl/doveadm-acl.c b/src/plugins/acl/doveadm-acl.c
@@ -353,7 +353,7 @@ cmd_acl_debug_mailbox_open(struct doveadm_mail_cmd_context *ctx,
 			   struct mail_user *user, const char *mailbox,
 			   struct mailbox **box_r)
 {
-	struct acl_user *auser = ACL_USER_CONTEXT(user);
+	struct acl_user *auser = ACL_USER_CONTEXT_REQUIRE(user);
 	struct mail_namespace *ns;
 	struct mailbox *box;
 	const char *path, *errstr;
@@ -394,7 +394,7 @@ cmd_acl_debug_mailbox_open(struct doveadm_mail_cmd_context *ctx,
 static bool cmd_acl_debug_mailbox(struct mailbox *box, bool *retry_r)
 {
 	struct mail_namespace *ns = mailbox_get_namespace(box);
-	struct acl_user *auser = ACL_USER_CONTEXT(ns->user);
+	struct acl_user *auser = ACL_USER_CONTEXT_REQUIRE(ns->user);
 	struct acl_object *aclobj = acl_mailbox_get_aclobj(box);
 	struct acl_backend *backend = acl_mailbox_list_get_backend(box->list);
 	struct acl_mailbox_list_context *iter;