From: Timo Sirainen <tss@iki.fi>
Date: Mon, 24 Jun 2013 20:06:45 +0000 (+0300)
Subject: dsync: Don't crash at deinit when dsync fails early.
X-Git-Tag: 2.2.4~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08bbf28bf9ca4965020fe8b29a3f8be5f0d03dff;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Don't crash at deinit when dsync fails early.
---

diff --git a/src/doveadm/dsync/dsync-brain.c b/src/doveadm/dsync/dsync-brain.c
index 3be8076094..2208894e3c 100644
--- a/src/doveadm/dsync/dsync-brain.c
+++ b/src/doveadm/dsync/dsync-brain.c
@@ -242,8 +242,10 @@ int dsync_brain_deinit(struct dsync_brain **_brain)
 		dsync_brain_sync_mailbox_deinit(brain);
 	if (brain->local_tree_iter != NULL)
 		dsync_mailbox_tree_iter_deinit(&brain->local_tree_iter);
-	dsync_mailbox_tree_deinit(&brain->local_mailbox_tree);
-	dsync_mailbox_tree_deinit(&brain->remote_mailbox_tree);
+	if (brain->local_mailbox_tree != NULL)
+		dsync_mailbox_tree_deinit(&brain->local_mailbox_tree);
+	if (brain->remote_mailbox_tree != NULL)
+		dsync_mailbox_tree_deinit(&brain->remote_mailbox_tree);
 	if (brain->mailbox_states_iter != NULL)
 		hash_table_iterate_deinit(&brain->mailbox_states_iter);
 	hash_table_destroy(&brain->mailbox_states);