From: Timo Sirainen <tss@iki.fi>
Date: Thu, 13 Jun 2013 21:16:14 +0000 (+0300)
Subject: dsync: Avoid wasting data stack on larger renames.
X-Git-Tag: 2.2.3~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c32a2a98d7dd630406410d39d2173f14b7e6eff8;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Avoid wasting data stack on larger renames.
---

diff --git a/src/doveadm/dsync/dsync-mailbox-tree-sync.c b/src/doveadm/dsync/dsync-mailbox-tree-sync.c
index 2d3895dd04..ac9cbacc5f 100644
--- a/src/doveadm/dsync/dsync-mailbox-tree-sync.c
+++ b/src/doveadm/dsync/dsync-mailbox-tree-sync.c
@@ -717,6 +717,7 @@ static bool sync_rename_mailboxes(struct dsync_mailbox_tree_sync_ctx *ctx,
 	struct dsync_mailbox_node **local_nodep = &local_parent->first_child;
 	struct dsync_mailbox_node **remote_nodep = &remote_parent->first_child;
 	struct dsync_mailbox_node *local_node, *remote_node;
+	bool changed;
 
 	/* the nodes are sorted by their names. */
 	while (*local_nodep != NULL || *remote_nodep != NULL) {
@@ -750,11 +751,19 @@ static bool sync_rename_mailboxes(struct dsync_mailbox_tree_sync_ctx *ctx,
 			/* mailboxes are equal, no need to rename */
 		} else {
 			/* mailbox naming conflict */
-			if (sync_rename_conflict(ctx, local_node, remote_node))
+			T_BEGIN {
+				changed = sync_rename_conflict(ctx, local_node,
+							       remote_node);
+			} T_END;
+			if (changed)
 				return TRUE;
 		}
 		/* handle children, if there are any */
-		if (sync_rename_mailboxes(ctx, local_node, remote_node))
+		T_BEGIN {
+			changed = sync_rename_mailboxes(ctx, local_node,
+							remote_node);
+		} T_END;
+		if (changed)
 			return TRUE;
 
 		local_nodep = &local_node->next;