From: Timo Sirainen <tss@iki.fi>
Date: Thu, 3 Sep 2015 19:12:14 +0000 (+0300)
Subject: dsync: Assert-crashfix
X-Git-Tag: 2.2.19.rc1~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57c5e11941482d3603fc03482f78e07fa0f81ee5;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Assert-crashfix
Fixes:

Panic: file mail-storage.c: line 1897 (mailbox_save_alloc): assertion
failed: (!ctx->unfinished)
---

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index 2df381ec4c..0653616c89 100644
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -2271,6 +2271,7 @@ dsync_mailbox_save_body(struct dsync_mailbox_importer *importer,
 	if (!remote_mail) {
 		/* the mail isn't remote yet. we were just trying to copy a
 		   local mail to avoid downloading the remote mail. */
+		mailbox_save_cancel(&save_ctx);
 		return FALSE;
 	}
 	if (mail->minimal_fields) {