BUGFIX: forced-fail smtp option tls_sni would dereference NULL

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 71d239288b808422aa6bb71805a10602d9a29e57..66fb1ca322f4fe27110aa28a947b5d4236671b71 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -37,6 +37,9 @@ JH/01 Bugzilla 1201 & 304 - New cutthrough-delivery feature, with TLS support.
 
 JH/02 Support "G" suffix to numbers in ${if comparisons.
 
+PP/08 Handle smtp transport tls_sni option forced-fail for OpenSSL.
+
+
 Exim version 4.80
 -----------------
 

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index a8a62fe8cbbc2ad7e263abe9342f7a9c585af0ee..64aa689fb74ab727a0cee93b0c1538d720afb645 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -1338,7 +1338,11 @@ if (sni)
   {
   if (!expand_check(sni, US"tls_sni", &tls_out.sni))
     return FAIL;
-  if (!Ustrlen(tls_out.sni))
+  if (tls_out.sni == NULL)
+    {
+    DEBUG(D_tls) debug_printf("Setting TLS SNI forced to fail, not sending\n");
+    }
+  else if (!Ustrlen(tls_out.sni))
     tls_out.sni = NULL;
   else
     {