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

dovecot at dovecot.org dovecot at dovecot.org
Wed Aug 7 19:26:40 EEST 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/225655115265
changeset: 16680:225655115265
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Aug 07 19:26:29 2013 +0300
description:
dsync: Avoid assert-crash after an error.

diffstat:

 src/doveadm/dsync/dsync-mailbox-import.c |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r 27ebd9552471 -r 225655115265 src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Wed Aug 07 18:00:32 2013 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Wed Aug 07 19:26:29 2013 +0300
@@ -1395,8 +1395,11 @@
 	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.


More information about the dovecot-cvs mailing list