Ensure lookup-result variables are dropped between messages on a connection

2 files changed, 6 insertions, 1 deletions

diff --git a/src/src/exim.c b/src/src/exim.c
index 6bc95d241..920e9e226 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -5115,6 +5115,8 @@ if (host_checking)
       deliver_localpart_orig = NULL;
       deliver_domain_orig = NULL;
       callout_address = sending_ip_address = NULL;
+      deliver_localpart_data = deliver_domain_data =
+      recipient_data = sender_data = NULL;
       sender_rate = sender_rate_limit = sender_rate_period = NULL;
       }
     smtp_log_no_mail();
@@ -5767,6 +5769,8 @@ moreloop:
 #endif
   callout_address = NULL;
   sending_ip_address = NULL;
+  deliver_localpart_data = deliver_domain_data =
+  recipient_data = sender_data = NULL;
   acl_var_m = NULL;
   for(int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
 
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index d72adc15c..b3d1acbf9 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -2056,7 +2056,8 @@ f.active_local_from_check = local_from_check;          /* Can be set by ACL */
 f.active_local_sender_retain = local_sender_retain;    /* Can be set by ACL */
 sending_ip_address = NULL;
 return_path = sender_address = NULL;
-sender_data = NULL;				     /* Can be set by ACL */
+deliver_localpart_data = deliver_domain_data =
+recipient_data = sender_data = NULL;			/* Can be set by ACL */
 deliver_localpart_parent = deliver_localpart_orig = NULL;
 deliver_domain_parent = deliver_domain_orig = NULL;
 callout_address = NULL;