X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fstring.c;h=288466113fe860303f72b8cdecfc31b13c2e45fb;hb=aaabfafe3fb76b1e09a68317ef4b3d5bc94fa9be;hp=8cc34a0773cbb70cad5ff5b388be03c62e6a9636;hpb=f8d78f744328266ad9f7f48cf5ca8f7d67c227c4;p=exim.git diff --git a/src/src/string.c b/src/src/string.c index 8cc34a077..288466113 100644 --- a/src/src/string.c +++ b/src/src/string.c @@ -1277,8 +1277,10 @@ else if (!(flags & SVFMT_TAINT_NOCHK)) dest_tainted = is_tainted(g->s); if (!(flags & SVFMT_TAINT_NOCHK) && !dest_tainted && is_tainted(format)) { +#ifndef MACRO_PREDEF if (!(flags & SVFMT_REBUFFER)) die_tainted(US"string_vformat", func, line); +#endif gstring_rebuffer(g); dest_tainted = TRUE; } @@ -1507,8 +1509,10 @@ while (*fp) gp = CS g->s + g->ptr; dest_tainted = TRUE; } +#ifndef MACRO_PREDEF else die_tainted(US"string_vformat", func, line); +#endif INSERT_STRING: /* Come to from %D or %M above */