diff options
| author | Wolfgang Breyha <wbreyha@gmx.net> | 2015-06-15 14:52:36 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-06-15 16:12:05 +0100 |
| commit | 9031f51a298749869af8c082bad850eb103db09a (patch) | |
| tree | 5261539f76f3d1dabaa4156ac844ba6a17361f16 | |
| parent | 65463bc9caf0c08e56e40047a1438d8a28fadba1 (diff) | |
| download | exim4-9031f51a298749869af8c082bad850eb103db09a.tar.gz | |
DSN: fix null deref when bounce is due to conn-timeout. Bug 1630
| -rw-r--r-- | src/src/deliver.c | 11 |
1 files changed, 1 insertions, 10 deletions
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') |