[exim-dev] [Bug 1630] EXPERIMENTAL_DSN SIGSEGV

Top Page
Delete this message
Reply to this message
Author: admin
Date:  
To: exim-dev
Subject: [exim-dev] [Bug 1630] EXPERIMENTAL_DSN SIGSEGV
https://bugs.exim.org/show_bug.cgi?id=1630

--- Comment #4 from Git Commit <git@???> ---
Git commit:
http://git.exim.org/exim.git/commitdiff/9031f51a298749869af8c082bad850eb103db09a

commit 9031f51a298749869af8c082bad850eb103db09a
Author:     Wolfgang Breyha <wbreyha@???>
AuthorDate: Mon Jun 15 14:52:36 2015 +0100
Commit:     Jeremy Harris <jgh146exb@???>
CommitDate: Mon Jun 15 16:12:05 2015 +0100


    DSN: fix null deref when bounce is due to conn-timeout.  Bug 1630
---
 src/src/deliver.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)


diff --git a/src/src/deliver.c b/src/src/deliver.c
index 2ee71f5..ec030fe 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')

--
You are receiving this mail because:
You are on the CC list for the bug.