[exim-cvs] expand

Gitweb: https://git.exim.org/exim.git/commitdiff/0fa46a83a55054c65ffc539405f62bf86aac5b44

Commit:     0fa46a83a55054c65ffc539405f62bf86aac5b44
Parent:     f7c791b769a3a5395d92d29d27aa58f9d442373c
Author:     Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Thu Apr 1 21:33:50 2021 +0200
Committer:  Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Thu Jun 24 21:43:11 2021 +0200

    expand

    (cherry picked from commit c02ea85f525ff256d78e084d6f76fe3032fd52e1)
---
 src/src/expand.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/src/expand.c b/src/src/expand.c
index 989e97b..0ae2aea 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4483,13 +4483,13 @@ DEBUG(D_expand)
f.expand_string_forcedfail = FALSE;
expand_string_message = US"";

-if (is_tainted(string))
+{ uschar *m;
+if (m = is_tainted2(string, LOG_MAIN|LOG_PANIC, "Tainted string '%s' in expansion", s))
   {
-  expand_string_message =
-    string_sprintf("attempt to expand tainted string '%s'", s);
-  log_write(0, LOG_MAIN|LOG_PANIC, "%s", expand_string_message);
+  expand_string_message = m;
   goto EXPAND_FAILED;
   }
+}

while (*s)
{