From: Timo Sirainen <tss@iki.fi>
Date: Wed, 7 Aug 2013 16:26:29 +0000 (+0300)
Subject: dsync: Avoid assert-crash after an error.
X-Git-Tag: 2.2.6~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e04e2ca2a536e2d1ea0c3d4dde68902ab14ea6c7;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Avoid assert-crash after an error.
---

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index 8d27cc84f8..85c9ab9639 100644
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -1395,8 +1395,11 @@ int dsync_mailbox_import_change(struct dsync_mailbox_importer *importer,
 	if (importer->failed)
 		return -1;
 
-	if (!importer->last_common_uid_found)
+	if (!importer->last_common_uid_found) {
 		dsync_mailbox_find_common_uid(importer, change);
+		if (importer->failed)
+			return -1;
+	}
 
 	if (importer->last_common_uid_found) {
 		/* a) uid <= last_common_uid for flag changes and expunges.