X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpqueue.c;h=e9053981e1e28053bb94240d402f0b0d94074e6d;hb=cdc34fa661ed54fdcebf86521496220cc28f4943;hp=c4b46142a250eef6e7653c256bf0b4d9117ecd9a;hpb=5bf6670f304602919abae191ba88232d693de1ff;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index c4b46142a..e9053981e 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -161,17 +161,28 @@ void RemoveQItem(OneQueItem *MyQItem)
 void FreeMailQEntry(void *qv)
 {
 	MailQEntry *Q = qv;
+/*
+	syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__);
+	cit_backtrace();
+*/
 	FreeStrBuf(&Q->Recipient);
 	FreeStrBuf(&Q->StatusMessage);
+
+	memset(Q, 0, sizeof(MailQEntry));
 	free(Q);
 }
 void FreeQueItem(OneQueItem **Item)
 {
+/*
+	syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__);
+	cit_backtrace();
+*/
 	DeleteHash(&(*Item)->MailQEntries);
 	FreeStrBuf(&(*Item)->EnvelopeFrom);
 	FreeStrBuf(&(*Item)->BounceTo);
 	FreeStrBuf(&(*Item)->SenderRoom);
 	FreeURL(&(*Item)->URL);
+	memset(*Item, 0, sizeof(OneQueItem));
 	free(*Item);
 	Item = NULL;
 }
@@ -1061,7 +1072,7 @@ CTDL_MODULE_INIT(smtp_queu)
 		Put(QItemHandlers, HKEY("submitted"), QItem_Handle_Submitted, reference_free_handler);
 		smtp_init_spoolout();
 
-		CtdlRegisterCleanupHook(smtp_evq_cleanup);
+		CtdlRegisterEVCleanupHook(smtp_evq_cleanup);
 
 		CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
 		CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);