[exim-cvs] deliver

Gitweb: https://git.exim.org/exim.git/commitdiff/951b668a191ef510a4e27d8204c5fa82ca957a07

Commit:     951b668a191ef510a4e27d8204c5fa82ca957a07
Parent:     ee4924bc711f54a751448fb5cee5ec4fc9c96196
Author:     Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Sat Apr 3 10:54:22 2021 +0200
Committer:  Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Thu Jun 24 21:43:14 2021 +0200

    deliver

    (cherry picked from commit 2bafe3fc82cf62f0c21f939f5891b8d067f3abc7)
---
 src/src/deliver.c  | 5 +++--
 test/paniclog/0608 | 2 +-
 test/stderr/0608   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/src/deliver.c b/src/src/deliver.c
index a6f6882..b5530bc 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -6165,9 +6165,10 @@ else if (system_filter && process_recipients != RECIP_FAIL_TIMEOUT)
           if (!tmp)
             p->message = string_sprintf("failed to expand \"%s\" as a "
               "system filter transport name", tpname);
-      if (is_tainted2(tmp, 0, m = string_sprintf("Tainted values '%s' "
-              "for transport '%s' as a system filter", tmp, tpname)))
+          { uschar *m;
+      if (m = is_tainted2(tmp, 0, "Tainted values '%s' " "for transport '%s' as a system filter", tmp, tpname))
             p->message = m;
+          }
           tpname = tmp;
           }
         else
diff --git a/test/paniclog/0608 b/test/paniclog/0608
index 0cf96cf..aa9fc2b 100644
--- a/test/paniclog/0608
+++ b/test/paniclog/0608
@@ -3,6 +3,6 @@

2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset'

-2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@???'
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 Tainted bounce_message_file after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@???'

2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory
diff --git a/test/stderr/0608 b/test/stderr/0608
index 0cf96cf..aa9fc2b 100644
--- a/test/stderr/0608
+++ b/test/stderr/0608
@@ -3,6 +3,6 @@

2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset'

-2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@???'
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 Tainted bounce_message_file after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@???'

2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory