From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 2 Mar 2021 15:25:31 +0000 (+0200)
Subject: imap-urlauth: client_destroy() - Allow NULL reason only if client is disconnected
X-Git-Tag: 2.3.15~258
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33d03c7aa8726aa833d125e4b353301da7d44e2a;p=thirdparty%2Fdovecot%2Fcore.git

imap-urlauth: client_destroy() - Allow NULL reason only if client is disconnected
---

diff --git a/src/imap-urlauth/imap-urlauth-client.c b/src/imap-urlauth/imap-urlauth-client.c
index 75af94d1af..c5e82a811c 100644
--- a/src/imap-urlauth/imap-urlauth-client.c
+++ b/src/imap-urlauth/imap-urlauth-client.c
@@ -328,13 +328,12 @@ void client_worker_input(struct client *client)
 
 void client_destroy(struct client *client, const char *reason)
 {
+	i_assert(reason != NULL || client->disconnected);
+
 	i_set_failure_prefix("%s: ", master_service_get_name(master_service));
 
-	if (!client->disconnected) {
-		if (reason == NULL)
-			reason = "Connection closed";
+	if (!client->disconnected)
 		i_info("Disconnected: %s", reason);
-	}
 
 	imap_urlauth_client_count--;
 	DLLIST_REMOVE(&imap_urlauth_clients, client);