Mark variables that are unused before release of store in the receive message loop

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index f3f849af6cac68fab668788ad9e3b19acc80cb0f..6fb4402030d3da27e26091e5413dc094793c3fd8 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -146,7 +146,8 @@ JH/28 Ensure that variables possibly set during message acceptance are marked
       about them when the debug_store option is enabled.  Discovered specifically
       for sender_rate_period, but applies to a whole set of variables.
       Do the same for the queue-runner loop, for variables set from spool
-      message files.
+      message files.  Do the same for the SMTP per-message loop, for certain
+      variables indirectly set in ACL operations.
 
 
 Exim version 4.90

diff --git a/src/src/acl.c b/src/src/acl.c
index f6141165c2fa0e78d77cc7f6b449a2bb12421396..35d955da6a2c584f52cbac5ca66de755c59a8fa5 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -4477,7 +4477,7 @@ switch (where)
   }
 
 deliver_domain = deliver_localpart = deliver_address_data =
-  sender_address_data = NULL;
+  deliver_domain_data = sender_address_data = NULL;
 
 /* A DISCARD response is permitted only for message ACLs, excluding the PREDATA
 ACL, which is really in the middle of an SMTP command. */

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 6cac7d2e2a23c896754f6751975ba82d56a122af..c9fe792201a3e541424992d278184fa84b6cce66 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -1980,8 +1980,8 @@ 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_orig = NULL;
-deliver_domain_orig = NULL;
+deliver_localpart_parent = deliver_localpart_orig = NULL;
+deliver_domain_parent = deliver_domain_orig = NULL;
 callout_address = NULL;
 submission_name = NULL;                              /* Can be set by ACL */
 raw_sender = NULL;                  /* After SMTP rewrite, before qualifying */