From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 26 Jun 2018 19:33:33 +0000 (+0300)
Subject: quota-clone: Fix assert-crash at deinit if quota_clone update fails
X-Git-Tag: 2.3.3.rc1~221
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13b36eb233ccfc498c2b906f5c116b34ae2e5783;p=thirdparty%2Fdovecot%2Fcore.git

quota-clone: Fix assert-crash at deinit if quota_clone update fails

The timeout isn't removed on failure, so it crashed with:
Panic: file quota-clone-plugin.c: line 257 (quota_clone_mail_user_deinit_pre): assertion failed: (quser->to_quota_flush == NULL)
---

diff --git a/src/plugins/quota-clone/quota-clone-plugin.c b/src/plugins/quota-clone/quota-clone-plugin.c
index 3f10bf3968..d01f1b052a 100644
--- a/src/plugins/quota-clone/quota-clone-plugin.c
+++ b/src/plugins/quota-clone/quota-clone-plugin.c
@@ -240,7 +240,9 @@ static void quota_clone_mail_user_deinit_pre(struct mail_user *user)
 		i_assert(!quser->quota_flushing);
 		quota_clone_flush(user);
 		dict_wait(quser->dict);
-		i_assert(quser->to_quota_flush == NULL);
+		/* If dict update fails or background calculation is running,
+		   the timeout is still set. Just forget about it. */
+		timeout_remove(&quser->to_quota_flush);
 	}
 	quser->module_ctx.super.deinit_pre(user);
 }