diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-03-15 14:23:04 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-03-15 15:42:50 +0000 |
| commit | c679ee08b006c8fe4c62b353d909c992a725fc11 (patch) | |
| tree | 5fc49991c7760b0ea733218bf4a36051e9e0d3a0 | |
| parent | 07e347abb7bbb61302470a8514cedd1037de9f59 (diff) | |
Mark variables that are unused before release of store in the receive message loop
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | src/src/acl.c | 2 | ||||
| -rw-r--r-- | src/src/smtp_in.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index f3f849af6..6fb440203 100644 --- 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 f6141165c..35d955da6 100644 --- 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 6cac7d2e2..c9fe79220 100644 --- 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 */ |