[exim-cvs] safer coding of router toplevel

Gitweb: https://git.exim.org/exim.git/commitdiff/c657b20d9b1dfc2f437cc4ea220fa9ee7ba73088

Commit:     c657b20d9b1dfc2f437cc4ea220fa9ee7ba73088
Parent:     31651e77a5a5e9153083aba0a4ad6ba12869fd65
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Aug 14 13:46:08 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Aug 14 13:46:08 2024 +0100

    safer coding of router toplevel
---
 src/src/deliver.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/src/deliver.c b/src/src/deliver.c
index f383ab9be..0ba5f81b0 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -6660,7 +6660,7 @@ int i, rc, final_yield, process_recipients;
time_t now;
address_item * addr_last;
uschar * filter_message, * info;
-open_db dbblock, * dbm_file;
+open_db dbblock, * dbm_file = NULL;
extern int acl_where;

 CONTINUED_ID:
@@ -7469,9 +7469,7 @@ while (addr_new)           /* Loop until all addresses dealt with */
   queue run don't bother checking domain- or address-retry info; they will take
   effect on the second stage. */

-  if (f.queue_2stage)
-    dbm_file = NULL;
-  else
+  if (!f.queue_2stage)
     {
     /* If we have transaction-capable hintsdbs, open the retry db without
     locking, and leave open for the transport process and for subsequent
@@ -7925,7 +7923,7 @@ while (addr_new)           /* Loop until all addresses dealt with */

   if (dbm_file)
     if (exim_lockfile_needed())
-      { dbfn_close(dbm_file); dbm_file = NULL; }
+      { dbfn_close(dbm_file); continue_retry_db = dbm_file = NULL; }
     else
       DEBUG(D_hints_lookup) debug_printf("retaining retry hintsdb handle\n");

--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/