From 848214f788cb561935b8200d6e795df2de1cb8fa Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 18 Sep 2017 17:47:52 +0100 Subject: [PATCH] SOCKS: fix unitialized-pointer --- doc/doc-txt/ChangeLog | 3 +++ src/src/transports/smtp_socks.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index e777a2fb2..8f1b6b7ad 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -163,6 +163,9 @@ JH/26 Fix DKIM bug: when the pseudoheader generated for signing was exactly HS/02 Fix Bug 2130: large writes from the transport subprocess where chunked and confused the parent. +JH/27 Fix SOCKS bug: an unitialized pointer was deref'd by the transport process + which could crash as a result. This could lead to undeliverable messages. + Exim version 4.89 ----------------- diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c index 555843068..92d13659d 100644 --- a/src/src/transports/smtp_socks.c +++ b/src/src/transports/smtp_socks.c @@ -285,7 +285,7 @@ for(;;) sob = &proxies[idx]; /* bodge up a host struct for the proxy */ - proxy.address = sob->proxy_host; + proxy.address = proxy.name = sob->proxy_host; proxy_af = Ustrchr(sob->proxy_host, ':') ? AF_INET6 : AF_INET; if ((fd = smtp_sock_connect(&proxy, proxy_af, sob->port, -- 2.30.2