From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 28 Feb 2017 23:15:41 +0000 (+0000)
Subject: Memory Management: drop another variable ($callout_address) as it goes out of scope.
X-Git-Tag: exim-4_90_RC1~236
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=8c0d5ae8fdf1c1fed2ada225e345e72884774042

Memory Management: drop another variable ($callout_address) as it goes out of scope.
---

diff --git a/src/src/daemon.c b/src/src/daemon.c
index e9ecbe7d6..d7f579235 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -570,6 +570,7 @@ if (pid == 0)
     deliver_host_address = deliver_host =
     deliver_domain_orig = deliver_localpart_orig = NULL;
     dnslist_domain = dnslist_matched = NULL;
+    callout_address = NULL;
 #ifndef DISABLE_DKIM
     dkim_cur_signer = NULL;
 #endif
diff --git a/src/src/malware.c b/src/src/malware.c
index 547bc26e6..549422ebb 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -503,8 +503,8 @@ if (!malware_ok)
       break;
     switch(scanent->conn)
     {
-    case MC_TCP:  sock = ip_tcpsocket(scanner_options, &errstr, 5);	  break;
-    case MC_UNIX: sock = ip_unixsocket(scanner_options, &errstr);	  break;
+    case MC_TCP:  sock = ip_tcpsocket(scanner_options, &errstr, 5);	break;
+    case MC_UNIX: sock = ip_unixsocket(scanner_options, &errstr);	break;
     case MC_STRM: sock = ip_streamsocket(scanner_options, &errstr, 5);  break;
     default: /* compiler quietening */ break;
     }