From: Timo Sirainen <tss@iki.fi>
Date: Thu, 3 Sep 2015 17:55:18 +0000 (+0300)
Subject: lib-storage: Another fix to using index_storage_mailbox_close() without an opened... 
X-Git-Tag: 2.2.19.rc1~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a02f482ef1edd49c9c1899ab11ff2f3d354d13d;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Another fix to using index_storage_mailbox_close() without an opened view.
Calling mail_index_close() without mail_index_open() caused it to
assert-crash.
---

diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index 47f797a24a..37f8a973f1 100644
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -362,9 +362,10 @@ void index_storage_mailbox_close(struct mailbox *box)
 		mail_index_view_close(&box->view_pvt);
 	if (box->index_pvt != NULL)
 		mail_index_close(box->index_pvt);
-	if (box->view != NULL)
+	if (box->view != NULL) {
 		mail_index_view_close(&box->view);
-	mail_index_close(box->index);
+		mail_index_close(box->index);
+	}
 	box->cache = NULL;
 
 	ibox->keyword_names = NULL;