SOCKS: fix unitialized-pointer

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index afd41e40a7652dd30b5b0af6f8bee29715727ed2..089aeb77480a461634a7fb6cba50609b6a80c267 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -43,6 +43,9 @@ JH/26 Fix DKIM bug: when the pseudoheader generated for signing was exactly
       line, the header hash was calculated to an incorrect value thanks to
       the (relaxed) space the fold became.
 
       line, the header hash was calculated to an incorrect value thanks to
       the (relaxed) space the fold became.
 

+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
 -----------------
 
 Exim version 4.89
 -----------------

diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c
index 5558430686e5b3bdefaecf36ea64c50e23392dd4..92d13659df4cc52d4c9c3c35e05b7e17d0f94123 100644 (file)
--- 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 */
   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,
   proxy_af = Ustrchr(sob->proxy_host, ':') ? AF_INET6 : AF_INET;
 
   if ((fd = smtp_sock_connect(&proxy, proxy_af, sob->port,