Mercurial > dovecot > core-2.2

changeset 19659:c198a998082c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imapc: Fixed assert-crash in mailbox syncing, if mailbox couldn't be opened. Usually meaning that syncing was attempted when IMAP server couldn't be connected to. Fixes the assert: Panic: file imapc-client.c: line 439 (imapc_client_get_capabilities): assertion failed: (conn != NULL)
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Thu, 28 Jan 2016 16:26:53 +0200
parents 3cc8fb81e7f9
children 7a3a138a4986
files src/lib-storage/index/imapc/imapc-sync.c
diffstat 1 files changed, 19 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/imapc/imapc-sync.c	Thu Jan 28 15:36:58 2016 +0200
+++ b/src/lib-storage/index/imapc/imapc-sync.c	Thu Jan 28 16:26:53 2016 +0200
@@ -502,12 +502,28 @@
 	return 0;
 }
 
+static void
+imapc_noop_if_needed(struct imapc_mailbox *mbox, enum mailbox_sync_flags flags)
+{
+	enum imapc_capability capabilities;
+
+	capabilities = imapc_client_get_capabilities(mbox->storage->client->client);
+	if ((capabilities & IMAPC_CAPABILITY_IDLE) == 0 ||
+	    (flags & MAILBOX_SYNC_FLAG_FULL_READ) != 0) {
+		/* do NOOP to make sure we have the latest changes before
+		   starting sync. this is necessary either because se don't
+		   support IDLE at all, or because we want to be sure that we
+		   have the latest changes (IDLE is started with a small delay,
+		   so we might not actually even be in IDLE right not) */
+		imapc_mailbox_noop(mbox);
+	}
+}
+
 struct mailbox_sync_context *
 imapc_mailbox_sync_init(struct mailbox *box, enum mailbox_sync_flags flags)
 {
 	struct imapc_mailbox *mbox = (struct imapc_mailbox *)box;
 	struct imapc_mailbox_list *list = mbox->storage->client->_list;
-	enum imapc_capability capabilities;
 	bool changes;
 	int ret = 0;
 
@@ -522,16 +538,8 @@
 			ret = -1;
 	}
 
-	capabilities = imapc_client_get_capabilities(mbox->storage->client->client);
-	if ((capabilities & IMAPC_CAPABILITY_IDLE) == 0 ||
-	    (flags & MAILBOX_SYNC_FLAG_FULL_READ) != 0) {
-		/* do NOOP to make sure we have the latest changes before
-		   starting sync. this is necessary either because se don't
-		   support IDLE at all, or because we want to be sure that we
-		   have the latest changes (IDLE is started with a small delay,
-		   so we might not actually even be in IDLE right not) */
-		imapc_mailbox_noop(mbox);
-	}
+	if (ret == 0)
+		imapc_noop_if_needed(mbox, flags);
 
 	if (imapc_mailbox_commit_delayed_trans(mbox, &changes) < 0)
 		ret = -1;