From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 12 Aug 2021 07:02:55 +0000 (+0300)
Subject: lib-storage: Add data stack frame for mailbox_copy and mailbox_move
X-Git-Tag: 2.3.17~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c513b9a13d502bfcd64a5b08a0f78595714d2bbb;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Add data stack frame for mailbox_copy and mailbox_move
---

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index a8a9b39e9f..1002d8368d 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -2796,7 +2796,12 @@ int mailbox_copy(struct mail_save_context **_ctx, struct mail *mail)
 	i_assert(!ctx->saving);
 	i_assert(!ctx->moving);
 
-	return mailbox_copy_int(_ctx, mail);
+	int ret;
+	T_BEGIN {
+		ret = mailbox_copy_int(_ctx, mail);
+	} T_END;
+
+	return ret;
 }
 
 int mailbox_move(struct mail_save_context **_ctx, struct mail *mail)
@@ -2808,8 +2813,10 @@ int mailbox_move(struct mail_save_context **_ctx, struct mail *mail)
 	i_assert(!ctx->moving);
 
 	ctx->moving = TRUE;
-	if ((ret = mailbox_copy_int(_ctx, mail)) == 0)
-		mail_expunge(mail);
+	T_BEGIN {
+		if ((ret = mailbox_copy_int(_ctx, mail)) == 0)
+			mail_expunge(mail);
+	} T_END;
 	ctx->moving = FALSE;
 	return ret;
 }