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

dovecot at dovecot.org dovecot at dovecot.org
Mon Jun 24 23:06:59 EEST 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/07e314199f56
changeset: 16541:07e314199f56
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jun 24 23:06:45 2013 +0300
description:
dsync: Don't crash at deinit when dsync fails early.

diffstat:

 src/doveadm/dsync/dsync-brain.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (16 lines):

diff -r 84014270ee37 -r 07e314199f56 src/doveadm/dsync/dsync-brain.c
--- a/src/doveadm/dsync/dsync-brain.c	Mon Jun 24 22:25:47 2013 +0300
+++ b/src/doveadm/dsync/dsync-brain.c	Mon Jun 24 23:06:45 2013 +0300
@@ -242,8 +242,10 @@
 		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);


More information about the dovecot-cvs mailing list