From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 1 Nov 2023 09:52:06 +0000 (+0200)
Subject: mdbox: Fix assert-crash if syncing causes storage rebuild
X-Git-Tag: 2.4.0~2461
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de12c210dfea039aba35e04f793d5e456a72c545;p=thirdparty%2Fdovecot%2Fcore.git

mdbox: Fix assert-crash if syncing causes storage rebuild

Fixes:
Panic: file mail-index-sync.c: line 419 (mail_index_sync_begin_to2): assertion failed: (!index->syncing)

Broken by b073a14640cab4b9e2a84a783aac2f7fd0102473
---

diff --git a/src/lib-storage/index/dbox-multi/mdbox-sync.c b/src/lib-storage/index/dbox-multi/mdbox-sync.c
index ec1853469d..874c843ceb 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-sync.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-sync.c
@@ -355,6 +355,7 @@ int mdbox_sync(struct mdbox_mailbox *mbox, enum mdbox_sync_flags flags)
 
 		/* we'll need to rebuild storage.
 		   try again from the beginning. */
+		(void)mdbox_map_atomic_finish(&atomic);
 		return mdbox_sync(mbox, flags);
 	}