From: Wolfgang Breyha <wbreyha@gmx.net>
Date: Mon, 15 Jun 2015 13:52:36 +0000 (+0100)
Subject: DSN: fix null deref when bounce is due to conn-timeout.  Bug 1630
X-Git-Tag: exim-4_86_RC3~6
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/9031f51a298749869af8c082bad850eb103db09a?ds=inline

DSN: fix null deref when bounce is due to conn-timeout.  Bug 1630
---

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 2ee71f502..ec030fefb 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -4876,17 +4876,8 @@ if (s)
   s += 2;  /* skip ": " */
   fprintf(f, "Diagnostic-Code: smtp; ");
   }
-/* user_message set? use it instead */
-else if ((s = addr->user_message))
-  {
-  DEBUG(D_deliver)
-    debug_printf("DSN Diagnostic-Code: addr->user_message = %s\n", s);
-  /* local errors like timeout get 426 */
-  fprintf(f, "Diagnostic-Code: smtp; 426 ");
-  }
 /* no message available. do nothing */
-else
-  return;
+else return;
 
 while (*s)
   if (*s == '\\' && s[1] == 'n')