smtp_accept_map_per_host: call search_tidyup in fail path. Bug 2597

(cherry-picked from: d3a538c8fe)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 41d8c627617b22bc4a844ff894d37e443d99bda6..92298e7fc8698f3f3f5cdc3a9fbdd249b4f3e070 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -31,6 +31,11 @@ JH/06 Bug 2594: Change the name used for certificate name checks in the smtp
       the head of the CNAME chain leading there (if there is one).  This seems
       to align better with RFC 6125.
 
+JH/07 Bug 2597: Fix a resource leak.  Using a lookup in obtaining a value for
+      smtp_accept_max_per_host allocated resources which were not released
+      when the limit was exceeded.  This eventually crashed the daemon.  Fix
+      by adding a relase action in that path.
+
 
 Exim version 4.94
 -----------------

diff --git a/src/src/daemon.c b/src/src/daemon.c
index 2bed143a188ac1ed57e263904c142309545bd813..9d491593fd545fef3cab0f78290dad5dd5afee72 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -336,6 +336,7 @@ if ((max_for_this_host > 0) &&
     log_write(L_connection_reject,
               LOG_MAIN, "Connection from %s refused: too many connections "
       "from that IP address", whofrom->s);
+    search_tidyup();
     goto ERROR_RETURN;
     }
   }