Merge branch 'hs/taintwarn'

[exim.git] / src / src / deliver.c

diff --git a/src/src/deliver.c b/src/src/deliver.c
index a6f68825c9238569ab3deac3be91f9def0b72d4b..f9f6746436ca0529ecb3194ee1b99dab85700670 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -6161,13 +6161,13 @@ else if (system_filter && process_recipients != RECIP_FAIL_TIMEOUT)
           {
           uschar *tmp = expand_string(tpname);
           address_file = address_pipe = NULL;
-          uschar *m;
           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