expand

(cherry picked from commit c02ea85f525ff256d78e084d6f76fe3032fd52e1)

diff --git a/src/src/expand.c b/src/src/expand.c
index 989e97b84bed7cfc9fe34442f51de71434c9ad40..0ae2aea92568aa80569993a13c1d0d802d98e87d 100644 (file)
--- 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"";
 
 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;
   }
   goto EXPAND_FAILED;
   }

+}

 
 while (*s)
   {
 
 while (*s)
   {