From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 20 May 2012 18:03:44 +0000 (+0200)
Subject: SMTP: free the queue item in the very last function, so we have a valid pointer to... 
X-Git-Tag: v8.11~7
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=82fcf5721fdbf10ac860bd551409ae7b8a4aed0c

SMTP: free the queue item in the very last function, so we have a valid pointer to the QID for logging.
---

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 0d3428fea..4b6dea395 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -203,14 +203,16 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 	}
 
 	RemoveContext(Msg->IO.CitContext);
-	if (Msg->IDestructQueItem)
-		RemoveQItem(Msg->MyQItem);
 	return eAbort;
 }
 
 eNextState Terminate(AsyncIO *IO)
 {
 	SmtpOutMsg *Msg = IO->Data;
+
+	if (Msg->IDestructQueItem)
+		RemoveQItem(Msg->MyQItem);
+
 	DeleteSmtpOutMsg(Msg);
 	return eAbort;
 }