From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Fri, 25 Sep 2020 01:21:06 +0000 (+0200)
Subject: lib-smtp: smtp-client-transaction - Make smtp_client_transaction_mail_abort(NULL... 
X-Git-Tag: 2.3.18~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86debae8fe78d3ee62f71c75fd8b835145715741;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: smtp-client-transaction - Make smtp_client_transaction_mail_abort(NULL) a no-op.
---

diff --git a/src/lib-smtp/smtp-client-transaction.c b/src/lib-smtp/smtp-client-transaction.c
index ffa763964c..a070a35c7e 100644
--- a/src/lib-smtp/smtp-client-transaction.c
+++ b/src/lib-smtp/smtp-client-transaction.c
@@ -115,12 +115,17 @@ void smtp_client_transaction_mail_abort(
 	struct smtp_client_transaction_mail **_mail)
 {
 	struct smtp_client_transaction_mail *mail = *_mail;
+
+	if (mail == NULL)
+		return;
+	*_mail = NULL;
+
 	struct smtp_client_transaction *trans = mail->trans;
 
 	i_assert(trans->state <= SMTP_CLIENT_TRANSACTION_STATE_MAIL_FROM ||
 		 trans->state == SMTP_CLIENT_TRANSACTION_STATE_ABORTED);
 
-	smtp_client_transaction_mail_free(_mail);
+	smtp_client_transaction_mail_free(&mail);
 }
 
 static void