From: Art Cancro <ajc@citadel.org>
Date: Fri, 7 Apr 2017 12:35:58 +0000 (-0400)
Subject: fix double-free when there are multiple mxes
X-Git-Tag: v939~567
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=2269e24e7f0b621a00c484206bac1888d40976d9

fix double-free when there are multiple mxes
---

diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c
index a7fb3052e..bfe665984 100644
--- a/citadel/modules/smtp/serv_smtpclient.c
+++ b/citadel/modules/smtp/serv_smtpclient.c
@@ -261,10 +261,10 @@ int smtp_attempt_delivery(long msgid, char *recp, char *envelope_from)
 				response_code = 421;
 			}
 
-		if (recipients != NULL) {
 			curl_slist_free_all(recipients);
-		}
-		curl_easy_cleanup(curl);
+			recipients = NULL;								// this gets reused; avoid double-free
+			curl_easy_cleanup(curl);
+			curl = NULL;									// this gets reused; avoid double-free
 		}
 	}