From 0df7f8a04ae1f5c9a02126e115b36b87b7dbe7d7 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 9 Jul 2019 18:35:24 +0300 Subject: [PATCH] lib-storage: mailbox_list_index_view_open() - Don't crash if list indexes are disabled This allows callers to call it without knowing if mailbox_list_index=yes --- src/lib-storage/list/mailbox-list-index.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib-storage/list/mailbox-list-index.c b/src/lib-storage/list/mailbox-list-index.c index 300ff3cc2e..ad932a9432 100644 --- a/src/lib-storage/list/mailbox-list-index.c +++ b/src/lib-storage/list/mailbox-list-index.c @@ -661,12 +661,16 @@ int mailbox_list_index_view_open(struct mailbox *box, bool require_refreshed, struct mail_index_view **view_r, uint32_t *seq_r) { - struct mailbox_list_index *ilist = INDEX_LIST_CONTEXT_REQUIRE(box->list); + struct mailbox_list_index *ilist = INDEX_LIST_CONTEXT(box->list); struct mailbox_list_index_node *node; struct mail_index_view *view; uint32_t seq; int ret; + if (ilist == NULL) { + /* mailbox list indexes aren't enabled */ + return 0; + } if (MAILBOX_IS_NEVER_IN_INDEX(box) && require_refreshed) { /* Optimization: Caller wants the list index to be up-to-date for this mailbox, but this mailbox isn't updated to the list -- 2.47.3