From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 21 Feb 2018 15:04:16 +0000 (+0200)
Subject: imapc: Fix assert-crash after detecting that multiple expunged mail reappear
X-Git-Tag: 2.3.9~2210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24cc64c148da0297352c5ee58b74962795809c42;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Fix assert-crash after detecting that multiple expunged mail reappear

The first imapc_mailbox_set_corrupted() call started a reconnect. The second
call crashed with:

Panic: file imapc-client.c: line 414 (imapc_client_mailbox_reconnect): assertion failed: (!box->reconnecting)
---

diff --git a/src/lib-storage/index/imapc/imapc-sync.c b/src/lib-storage/index/imapc/imapc-sync.c
index 3db2fab132..626ffc10d6 100644
--- a/src/lib-storage/index/imapc/imapc-sync.c
+++ b/src/lib-storage/index/imapc/imapc-sync.c
@@ -346,7 +346,7 @@ imapc_initial_sync_check(struct imapc_sync_context *ctx, bool nooped)
 			imapc_mailbox_set_corrupted(ctx->mbox,
 				"Expunged message uid=%u reappeared", ruid);
 			ctx->failed = TRUE;
-			rseq++;
+			return;
 		}
 	}
 }