Taint: reject or log more tainted list metadata elements

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

diff --git a/src/src/expand.c b/src/src/expand.c
index 052c059e8264c3be67840c936fb557a0c9f0d0d2..3e8f73d89d0b7f23b5bcc717479131a3997b2643 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4548,7 +4548,7 @@ for (int fill = 11 - Ustrlen(what); fill > 0; fill--)
   debug_printf("%V", "-");
 
 debug_printf("%s: %.*W\n", what, nchar, value);
   debug_printf("%V", "-");
 
 debug_printf("%s: %.*W\n", what, nchar, value);

-if (is_tainted(value))
+if (nchar > 0 && is_tainted(value))

   debug_printf_indent("%V          %V(tainted)\n",
     flags & ESI_SKIPPING ? "|" : " ", "\\__");
 }
   debug_printf_indent("%V          %V(tainted)\n",
     flags & ESI_SKIPPING ? "|" : " ", "\\__");
 }