Regard command-line recipients as tainted

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

diff --git a/src/src/string.c b/src/src/string.c
index 28d5780150e90bfe6318d5df2767b876a951d7e9..ced1ad8c78bfe71236b67242708ab82619fd799c 100644 (file)
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Miscellaneous string-handling functions. Some are not required for
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Miscellaneous string-handling functions. Some are not required for


@@ -10,7 +10,9 @@ utilities and tests, and are cut out by the COMPILE_UTILITY macro. */
 
 
 #include "exim.h"
 
 
 #include "exim.h"

+#include <assert.h>

 
 

+static void gstring_rebuffer(gstring * g);

 
 #ifndef COMPILE_UTILITY
 /*************************************************
 
 #ifndef COMPILE_UTILITY
 /*************************************************


@@ -36,13 +38,12 @@ Returns:    0 if the string is not a textual representation of an IP address
 int
 string_is_ip_address(const uschar *s, int *maskptr)
 {
 int
 string_is_ip_address(const uschar *s, int *maskptr)
 {

-int i;

 int yield = 4;
 
 /* If an optional mask is permitted, check for it. If found, pass back the
 offset. */
 
 int yield = 4;
 
 /* If an optional mask is permitted, check for it. If found, pass back the
 offset. */
 

-if (maskptr != NULL)
+if (maskptr)

   {
   const uschar *ss = s + Ustrlen(s);
   *maskptr = 0;
   {
   const uschar *ss = s + Ustrlen(s);
   *maskptr = 0;


@@ -59,7 +60,6 @@ if (Ustrchr(s, ':') != NULL)
   {
   BOOL had_double_colon = FALSE;
   BOOL v4end = FALSE;
   {
   BOOL had_double_colon = FALSE;
   BOOL v4end = FALSE;

-  int count = 0;

 
   yield = 6;
 
 
   yield = 6;
 


@@ -72,14 +72,14 @@ if (Ustrchr(s, ':') != NULL)
   may be one and only one appearance of double colon, which implies any number
   of binary zero bits. The number of preceding components is held in count. */
 
   may be one and only one appearance of double colon, which implies any number
   of binary zero bits. The number of preceding components is held in count. */
 

-  for (count = 0; count < 8; count++)
+  for (int count = 0; count < 8; count++)

     {
     /* If the end of the string is reached before reading 8 components, the
     address is valid provided a double colon has been read. This also applies
     if we hit the / that introduces a mask or the % that introduces the
     interface specifier (scope id) of a link-local address. */
 
     {
     /* If the end of the string is reached before reading 8 components, the
     address is valid provided a double colon has been read. This also applies
     if we hit the / that introduces a mask or the % that introduces the
     interface specifier (scope id) of a link-local address. */
 

-    if (*s == 0 || *s == '%' || *s == '/') return had_double_colon? yield : 0;
+    if (*s == 0 || *s == '%' || *s == '/') return had_double_colon ? yield : 0;

 
     /* If a component starts with an additional colon, we have hit a double
     colon. This is permitted to appear once only, and counts as at least
 
     /* If a component starts with an additional colon, we have hit a double
     colon. This is permitted to appear once only, and counts as at least


@@ -133,15 +133,18 @@ if (Ustrchr(s, ':') != NULL)
 
 /* Test for IPv4 address, which may be the tail-end of an IPv6 address. */
 
 
 /* Test for IPv4 address, which may be the tail-end of an IPv6 address. */
 

-for (i = 0; i < 4; i++)
+for (int i = 0; i < 4; i++)

   {
   {

+  long n;
+  uschar * end;
+

   if (i != 0 && *s++ != '.') return 0;
   if (i != 0 && *s++ != '.') return 0;

-  if (!isdigit(*s++)) return 0;
-  if (isdigit(*s) && isdigit(*(++s))) s++;
+  n = strtol(CCS s, CSS &end, 10);
+  if (n > 255 || n < 0 || end <= s || end > s+3) return 0;
+  s = end;

   }
 
   }
 

-return (*s == 0 || (*s == '/' && maskptr != NULL && *maskptr != 0))?
-  yield : 0;
+return !*s || (*s == '/' && maskptr && *maskptr != 0) ? yield : 0;

 }
 #endif  /* COMPILE_UTILITY */
 
 }
 #endif  /* COMPILE_UTILITY */
 


@@ -165,7 +168,7 @@ Returns:      pointer to the buffer
 uschar *
 string_format_size(int size, uschar *buffer)
 {
 uschar *
 string_format_size(int size, uschar *buffer)
 {

-if (size == 0) Ustrcpy(buffer, "     ");
+if (size == 0) Ustrcpy(buffer, US"     ");

 else if (size < 1024) sprintf(CS buffer, "%5d", size);
 else if (size < 10*1024)
   sprintf(CS buffer, "%4.1fK", (double)size / 1024.0);
 else if (size < 1024) sprintf(CS buffer, "%5d", size);
 else if (size < 10*1024)
   sprintf(CS buffer, "%4.1fK", (double)size / 1024.0);


@@ -220,6 +223,8 @@ interpreted in strings.
 Arguments:
   pp       points a pointer to the initiating "\" in the string;
            the pointer gets updated to point to the final character
 Arguments:
   pp       points a pointer to the initiating "\" in the string;
            the pointer gets updated to point to the final character

+           If the backslash is the last character in the string, it
+           is not interpreted.

 Returns:   the value of the character escape
 */
 
 Returns:   the value of the character escape
 */
 


@@ -232,6 +237,7 @@ const uschar *hex_digits= CUS"0123456789abcdef";
 int ch;
 const uschar *p = *pp;
 ch = *(++p);
 int ch;
 const uschar *p = *pp;
 ch = *(++p);

+if (ch == '\0') return **pp;

 if (isdigit(ch) && ch != '8' && ch != '9')
   {
   ch -= '0';
 if (isdigit(ch) && ch != '8' && ch != '9')
   {
   ch -= '0';


@@ -304,9 +310,9 @@ if (nonprintcount == 0) return s;
 /* Get a new block of store guaranteed big enough to hold the
 expanded string. */
 
 /* Get a new block of store guaranteed big enough to hold the
 expanded string. */
 

-ss = store_get(length + nonprintcount * 3 + 1);
+ss = store_get(length + nonprintcount * 3 + 1, is_tainted(s));

 
 

-/* Copy everying, escaping non printers. */
+/* Copy everything, escaping non printers. */

 
 t = s;
 tt = ss;
 
 t = s;
 tt = ss;


@@ -360,7 +366,7 @@ p = Ustrchr(s, '\\');
 if (!p) return s;
 
 len = Ustrlen(s) + 1;
 if (!p) return s;
 
 len = Ustrlen(s) + 1;

-ss = store_get(len);
+ss = store_get(len, is_tainted(s));

 
 q = ss;
 off = p - s;
 
 q = ss;
 off = p - s;


@@ -405,69 +411,37 @@ return ss;
 
 
 
 
 
 

+#if defined(HAVE_LOCAL_SCAN) && !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY)

 /*************************************************
 *            Copy and save string                *
 *************************************************/
 
 /*************************************************
 *            Copy and save string                *
 *************************************************/
 

-/* This function assumes that memcpy() is faster than strcpy().
-
+/*

 Argument: string to copy
 Argument: string to copy

-Returns:  copy of string in new store
+Returns:  copy of string in new store with the same taint status

 */
 
 uschar *
 */
 
 uschar *

-string_copy(const uschar *s)
+string_copy_function(const uschar *s)

 {
 {

-int len = Ustrlen(s) + 1;
-uschar *ss = store_get(len);
-memcpy(ss, s, len);
-return ss;
+return string_copy_taint(s, is_tainted(s));

 }
 
 }
 

-
-
-/*************************************************
-*     Copy and save string in malloc'd store     *
-*************************************************/
-

 /* This function assumes that memcpy() is faster than strcpy().
 /* This function assumes that memcpy() is faster than strcpy().

-
-Argument: string to copy
-Returns:  copy of string in new store
+As above, but explicitly specifying the result taint status

 */
 
 uschar *
 */
 
 uschar *

-string_copy_malloc(const uschar *s)
+string_copy_taint_function(const uschar * s, BOOL tainted)

 {
 int len = Ustrlen(s) + 1;
 {
 int len = Ustrlen(s) + 1;

-uschar *ss = store_malloc(len);
+uschar *ss = store_get(len, tainted);

 memcpy(ss, s, len);
 return ss;
 }
 
 
 
 memcpy(ss, s, len);
 return ss;
 }
 
 
 

-/*************************************************
-*       Copy, lowercase and save string          *
-*************************************************/
-
-/*
-Argument: string to copy
-Returns:  copy of string in new store, with letters lowercased
-*/
-
-uschar *
-string_copylc(const uschar *s)
-{
-uschar *ss = store_get(Ustrlen(s) + 1);
-uschar *p = ss;
-while (*s != 0) *p++ = tolower(*s++);
-*p = 0;
-return ss;
-}
-
-
-

 /*************************************************
 *       Copy and save string, given length       *
 *************************************************/
 /*************************************************
 *       Copy and save string, given length       *
 *************************************************/


@@ -483,36 +457,32 @@ Returns:    copy of string in new store
 */
 
 uschar *
 */
 
 uschar *

-string_copyn(const uschar *s, int n)
+string_copyn_function(const uschar *s, int n)

 {
 {

-uschar *ss = store_get(n + 1);
+uschar *ss = store_get(n + 1, is_tainted(s));

 Ustrncpy(ss, s, n);
 ss[n] = 0;
 return ss;
 }
 Ustrncpy(ss, s, n);
 ss[n] = 0;
 return ss;
 }

+#endif

 
 
 /*************************************************
 
 
 /*************************************************

-* Copy, lowercase, and save string, given length *
+*     Copy and save string in malloc'd store     *

 *************************************************/
 
 *************************************************/
 

-/* It is assumed the data contains no zeros. A zero is added
-onto the end.
-
-Arguments:
-  s         string to copy
-  n         number of characters
+/* This function assumes that memcpy() is faster than strcpy().

 
 

-Returns:    copy of string in new store, with letters lowercased
+Argument: string to copy
+Returns:  copy of string in new store

 */
 
 uschar *
 */
 
 uschar *

-string_copynlc(uschar *s, int n)
+string_copy_malloc(const uschar *s)

 {
 {

-uschar *ss = store_get(n + 1);
-uschar *p = ss;
-while (n-- > 0) *p++ = tolower(*s++);
-*p = 0;
+int len = Ustrlen(s) + 1;
+uschar *ss = store_malloc(len);
+memcpy(ss, s, len);

 return ss;
 }
 
 return ss;
 }
 


@@ -599,7 +569,7 @@ uschar *
 string_copy_dnsdomain(uschar *s)
 {
 uschar *yield;
 string_copy_dnsdomain(uschar *s)
 {
 uschar *yield;

-uschar *ss = yield = store_get(Ustrlen(s) + 1);
+uschar *ss = yield = store_get(Ustrlen(s) + 1, is_tainted(s));

 
 while (*s != 0)
   {
 
 while (*s != 0)
   {


@@ -647,41 +617,36 @@ uschar *t, *yield;
 /* First find the end of the string */
 
 if (*s != '\"')
 /* First find the end of the string */
 
 if (*s != '\"')

-  {

   while (*s != 0 && !isspace(*s)) s++;
   while (*s != 0 && !isspace(*s)) s++;

-  }

 else
   {
   s++;
 else
   {
   s++;

-  while (*s != 0 && *s != '\"')
+  while (*s && *s != '\"')

     {
     if (*s == '\\') (void)string_interpret_escape(&s);
     s++;
     }
     {
     if (*s == '\\') (void)string_interpret_escape(&s);
     s++;
     }

-  if (*s != 0) s++;
+  if (*s) s++;

   }
 
 /* Get enough store to copy into */
 
   }
 
 /* Get enough store to copy into */
 

-t = yield = store_get(s - *sptr + 1);
+t = yield = store_get(s - *sptr + 1, is_tainted(*sptr));

 s = *sptr;
 
 /* Do the copy */
 
 if (*s != '\"')
 s = *sptr;
 
 /* Do the copy */
 
 if (*s != '\"')

-  {

   while (*s != 0 && !isspace(*s)) *t++ = *s++;
   while (*s != 0 && !isspace(*s)) *t++ = *s++;

-  }

 else
   {
   s++;
   while (*s != 0 && *s != '\"')
     {
 else
   {
   s++;
   while (*s != 0 && *s != '\"')
     {

-    if (*s == '\\') *t++ = string_interpret_escape(&s);
-      else *t++ = *s;
+    *t++ = *s == '\\' ? string_interpret_escape(&s) : *s;

     s++;
     }
     s++;
     }

-  if (*s != 0) s++;
+  if (*s) s++;

   }
 
 /* Update the pointer and return the terminated copy */
   }
 
 /* Update the pointer and return the terminated copy */


@@ -698,7 +663,7 @@ return yield;
 *          Format a string and save it           *
 *************************************************/
 
 *          Format a string and save it           *
 *************************************************/
 

-/* The formatting is done by string_format, which checks the length of
+/* The formatting is done by string_vformat, which checks the length of

 everything.
 
 Arguments:
 everything.
 
 Arguments:


@@ -710,18 +675,24 @@ Returns:    pointer to fresh piece of store containing sprintf'ed string
 */
 
 uschar *
 */
 
 uschar *

-string_sprintf(const char *format, ...)
+string_sprintf_trc(const char *format, const uschar * func, unsigned line, ...)

 {
 {

+gstring * g;

 va_list ap;
 va_list ap;

-uschar buffer[STRING_SPRINTF_BUFFER_SIZE];
-va_start(ap, format);
-if (!string_vformat(buffer, sizeof(buffer), format, ap))
-  log_write(0, LOG_MAIN|LOG_PANIC_DIE,
-    "string_sprintf expansion was longer than " SIZE_T_FMT
-    "; format string was (%s)\nexpansion started '%.32s'",
-    sizeof(buffer), format, buffer);
+
+va_start(ap, line);
+g = string_vformat_trc(NULL, func, line, STRING_SPRINTF_BUFFER_SIZE,
+       SVFMT_REBUFFER|SVFMT_EXTEND, format, ap);

 va_end(ap);
 va_end(ap);

-return string_copy(buffer);
+
+if (!g)
+  log_write(0, LOG_MAIN|LOG_PANIC_DIE,
+    "string_sprintf expansion was longer than %d; format string was (%s)\n"
+    " called from %s %d\n",
+    STRING_SPRINTF_BUFFER_SIZE, format, func, line);
+
+gstring_release_unused(g);
+return string_from_gstring(g);

 }
 
 
 }
 
 


@@ -827,6 +798,17 @@ return NULL;
 
 
 
 
 
 

+#ifdef COMPILE_UTILITY
+/* Dummy version for this function; it should never be called */
+static void
+gstring_grow(gstring * g, int count)
+{
+assert(FALSE);
+}
+#endif
+
+
+

 #ifndef COMPILE_UTILITY
 /*************************************************
 *       Get next string from separated list      *
 #ifndef COMPILE_UTILITY
 /*************************************************
 *       Get next string from separated list      *


@@ -875,7 +857,7 @@ int sep = *separator;
 const uschar *s = *listptr;
 BOOL sep_is_special;
 
 const uschar *s = *listptr;
 BOOL sep_is_special;
 

-if (s == NULL) return NULL;
+if (!s) return NULL;

 
 /* This allows for a fixed specified separator to be an iscntrl() character,
 but at the time of implementation, this is never the case. However, it's best
 
 /* This allows for a fixed specified separator to be an iscntrl() character,
 but at the time of implementation, this is never the case. However, it's best


@@ -891,19 +873,17 @@ if (sep <= 0)
   if (*s == '<' && (ispunct(s[1]) || iscntrl(s[1])))
     {
     sep = s[1];
   if (*s == '<' && (ispunct(s[1]) || iscntrl(s[1])))
     {
     sep = s[1];

-    s += 2;
+    if (*++s) ++s;

     while (isspace(*s) && *s != sep) s++;
     }
   else
     while (isspace(*s) && *s != sep) s++;
     }
   else

-    {
-    sep = (sep == 0)? ':' : -sep;
-    }
+    sep = sep ? -sep : ':';

   *separator = sep;
   }
 
 /* An empty string has no list elements */
 
   *separator = sep;
   }
 
 /* An empty string has no list elements */
 

-if (*s == 0) return NULL;
+if (!*s) return NULL;

 
 /* Note whether whether or not the separator is an iscntrl() character. */
 
 
 /* Note whether whether or not the separator is an iscntrl() character. */
 


@@ -911,25 +891,23 @@ sep_is_special = iscntrl(sep);
 
 /* Handle the case when a buffer is provided. */
 
 
 /* Handle the case when a buffer is provided. */
 

-if (buffer != NULL)
+if (buffer)

   {
   int p = 0;
   {
   int p = 0;

-  for (; *s != 0; s++)
+  for (; *s; s++)

     {
     if (*s == sep && (*(++s) != sep || sep_is_special)) break;
     if (p < buflen - 1) buffer[p++] = *s;
     }
   while (p > 0 && isspace(buffer[p-1])) p--;
     {
     if (*s == sep && (*(++s) != sep || sep_is_special)) break;
     if (p < buflen - 1) buffer[p++] = *s;
     }
   while (p > 0 && isspace(buffer[p-1])) p--;

-  buffer[p] = 0;
+  buffer[p] = '\0';

   }
 
 /* Handle the case when a buffer is not provided. */
 
 else
   {
   }
 
 /* Handle the case when a buffer is not provided. */
 
 else
   {

-  int size = 0;
-  int ptr = 0;
-  const uschar *ss;
+  gstring * g = NULL;

 
   /* We know that *s != 0 at this point. However, it might be pointing to a
   separator, which could indicate an empty string, or (if an ispunct()
 
   /* We know that *s != 0 at this point. However, it might be pointing to a
   separator, which could indicate an empty string, or (if an ispunct()


@@ -951,13 +929,15 @@ else
 
   for (;;)
     {
 
   for (;;)
     {

-    for (ss = s + 1; *ss != 0 && *ss != sep; ss++);
-    buffer = string_cat(buffer, &size, &ptr, s, ss-s);
+    const uschar * ss;
+    for (ss = s + 1; *ss && *ss != sep; ) ss++;
+    g = string_catn(g, s, ss-s);

     s = ss;
     s = ss;

-    if (*s == 0 || *(++s) != sep || sep_is_special) break;
+    if (!*s || *++s != sep || sep_is_special) break;

     }
     }

-  while (ptr > 0 && isspace(buffer[ptr-1])) ptr--;
-  buffer[ptr] = 0;
+  while (g->ptr > 0 && isspace(g->s[g->ptr-1])) g->ptr--;
+  buffer = string_from_gstring(g);
+  gstring_release_unused(g);

   }
 
 /* Update the current pointer and return the new string */
   }
 
 /* Update the current pointer and return the new string */


@@ -965,104 +945,154 @@ else
 *listptr = s;
 return buffer;
 }
 *listptr = s;
 return buffer;
 }

-#endif  /* COMPILE_UTILITY */

 
 
 
 

-#ifndef COMPILE_UTILITY
+static const uschar *
+Ustrnchr(const uschar * s, int c, unsigned * len)
+{
+unsigned siz = *len;
+while (siz)
+  {
+  if (!*s) return NULL;
+  if (*s == c)
+    {
+    *len = siz;
+    return s;
+    }
+  s++;
+  siz--;
+  }
+return NULL;
+}
+
+

 /************************************************
 *      Add element to separated list           *
 ************************************************/
 /************************************************
 *      Add element to separated list           *
 ************************************************/

-/* This function is used to build a list, returning
-an allocated null-terminated growable string. The
-given element has any embedded seperator characters
+/* This function is used to build a list, returning an allocated null-terminated
+growable string. The given element has any embedded separator characters

 doubled.
 
 doubled.
 

+Despite having the same growable-string interface as string_cat() the list is
+always returned null-terminated.
+

 Arguments:
 Arguments:

-  list points to the start of the list that is being built, or NULL
+  list expanding-string for the list that is being built, or NULL

        if this is a new list that has no contents yet
        if this is a new list that has no contents yet

-  sep  list seperator charactoer
-  ele  new lement to be appended to the list
+  sep  list separator character
+  ele  new element to be appended to the list

 
 Returns:  pointer to the start of the list, changed if copied for expansion.
 */
 
 
 Returns:  pointer to the start of the list, changed if copied for expansion.
 */
 

-uschar *
-string_append_listele(uschar * list, uschar sep, const uschar * ele)
+gstring *
+string_append_listele(gstring * list, uschar sep, const uschar * ele)

 {
 {

-uschar * new = NULL;
-int sz = 0, off = 0;

 uschar * sp;
 
 uschar * sp;
 

-if (list)
-  {
-  new = string_cat(new, &sz, &off, list, Ustrlen(list));
-  new = string_cat(new, &sz, &off, &sep, 1);
-  }
+if (list && list->ptr)
+  list = string_catn(list, &sep, 1);

 
 while((sp = Ustrchr(ele, sep)))
   {
 
 while((sp = Ustrchr(ele, sep)))
   {

-  new = string_cat(new, &sz, &off, ele, sp-ele+1);
-  new = string_cat(new, &sz, &off, &sep, 1);
+  list = string_catn(list, ele, sp-ele+1);
+  list = string_catn(list, &sep, 1);

   ele = sp+1;
   }
   ele = sp+1;
   }

-new = string_cat(new, &sz, &off, ele, Ustrlen(ele));
-new[off] = '\0';
-return new;
+list = string_cat(list, ele);
+(void) string_from_gstring(list);
+return list;

 }
 
 
 }
 
 

-static const uschar *
-Ustrnchr(const uschar * s, int c, unsigned * len)
-{
-unsigned siz = *len;
-while (siz)
-  {
-  if (!*s) return NULL;
-  if (*s == c)
-    {
-    *len = siz;
-    return s;
-    }
-  s++;
-  siz--;
-  }
-return NULL;
-}
-
-uschar *
-string_append_listele_n(uschar * list, uschar sep, const uschar * ele,
-  unsigned len)
+gstring *
+string_append_listele_n(gstring * list, uschar sep, const uschar * ele,
+ unsigned len)

 {
 {

-uschar * new = NULL;
-int sz = 0, off = 0;

 const uschar * sp;
 
 const uschar * sp;
 

-if (list)
-  {
-  new = string_cat(new, &sz, &off, list, Ustrlen(list));
-  new = string_cat(new, &sz, &off, &sep, 1);
-  }
+if (list && list->ptr)
+  list = string_catn(list, &sep, 1);

 
 while((sp = Ustrnchr(ele, sep, &len)))
   {
 
 while((sp = Ustrnchr(ele, sep, &len)))
   {

-  new = string_cat(new, &sz, &off, ele, sp-ele+1);
-  new = string_cat(new, &sz, &off, &sep, 1);
+  list = string_catn(list, ele, sp-ele+1);
+  list = string_catn(list, &sep, 1);

   ele = sp+1;
   len--;
   }
   ele = sp+1;
   len--;
   }

-new = string_cat(new, &sz, &off, ele, len);
-new[off] = '\0';
-return new;
+list = string_catn(list, ele, len);
+(void) string_from_gstring(list);
+return list;
+}
+
+
+
+/* A slightly-bogus listmaker utility; the separator is a string so
+can be multiple chars - there is no checking for the element content
+containing any of the separator. */
+
+gstring *
+string_append2_listele_n(gstring * list, const uschar * sepstr,
+ const uschar * ele, unsigned len)
+{
+if (list && list->ptr)
+  list = string_cat(list, sepstr);
+
+list = string_catn(list, ele, len);
+(void) string_from_gstring(list);
+return list;
+}
+
+
+
+/************************************************/
+/* Add more space to a growable-string.  The caller should check
+first if growth is required.  The gstring struct is modified on
+return; specifically, the string-base-pointer may have been changed.
+
+Arguments:
+  g            the growable-string
+  count                amount needed for g->ptr to increase by
+*/
+
+static void
+gstring_grow(gstring * g, int count)
+{
+int p = g->ptr;
+int oldsize = g->size;
+BOOL tainted = is_tainted(g->s);
+
+/* Mostly, string_cat() is used to build small strings of a few hundred
+characters at most. There are times, however, when the strings are very much
+longer (for example, a lookup that returns a vast number of alias addresses).
+To try to keep things reasonable, we use increments whose size depends on the
+existing length of the string. */
+
+unsigned inc = oldsize < 4096 ? 127 : 1023;
+
+if (count <= 0) return;
+g->size = (p + count + inc + 1) & ~inc;                /* one for a NUL */
+
+/* Try to extend an existing allocation. If the result of calling
+store_extend() is false, either there isn't room in the current memory block,
+or this string is not the top item on the dynamic store stack. We then have
+to get a new chunk of store and copy the old string. When building large
+strings, it is helpful to call store_release() on the old string, to release
+memory blocks that have become empty. (The block will be freed if the string
+is at its start.) However, we can do this only if we know that the old string
+was the last item on the dynamic memory stack. This is the case if it matches
+store_last_get. */
+
+if (!store_extend(g->s, tainted, oldsize, g->size))
+  g->s = store_newblock(g->s, tainted, g->size, p);

 }
 }

-#endif  /* COMPILE_UTILITY */

 
 
 
 
 
 

-#ifndef COMPILE_UTILITY

 /*************************************************
 *             Add chars to string                *
 *************************************************/
 /*************************************************
 *             Add chars to string                *
 *************************************************/

-

 /* This function is used when building up strings of unknown length. Room is
 always left for a terminating zero to be added to the string that is being
 built. This function does not require the string that is being added to be NUL
 /* This function is used when building up strings of unknown length. Room is
 always left for a terminating zero to be added to the string that is being
 built. This function does not require the string that is being added to be NUL


@@ -1072,77 +1102,55 @@ sometimes called to extract parts of other strings.
 Arguments:
   string   points to the start of the string that is being built, or NULL
              if this is a new string that has no contents yet
 Arguments:
   string   points to the start of the string that is being built, or NULL
              if this is a new string that has no contents yet

-  size     points to a variable that holds the current capacity of the memory
-             block (updated if changed)
-  ptr      points to a variable that holds the offset at which to add
-             characters, updated to the new offset

   s        points to characters to add
   count    count of characters to add; must not exceed the length of s, if s
   s        points to characters to add
   count    count of characters to add; must not exceed the length of s, if s

-             is a C string
-
-If string is given as NULL, *size and *ptr should both be zero.
+             is a C string.

 
 Returns:   pointer to the start of the string, changed if copied for expansion.
            Note that a NUL is not added, though space is left for one. This is
            because string_cat() is often called multiple times to build up a
            string - there's no point adding the NUL till the end.
 
 Returns:   pointer to the start of the string, changed if copied for expansion.
            Note that a NUL is not added, though space is left for one. This is
            because string_cat() is often called multiple times to build up a
            string - there's no point adding the NUL till the end.

+

 */
 */

+/* coverity[+alloc] */

 
 

-uschar *
-string_cat(uschar *string, int *size, int *ptr, const uschar *s, int count)
+gstring *
+string_catn(gstring * g, const uschar *s, int count)

 {
 {

-int p = *ptr;
+int p;
+BOOL srctaint = is_tainted(s);

 
 

-if (p + count >= *size)
+if (!g)

   {
   {

-  int oldsize = *size;
-
-  /* Mostly, string_cat() is used to build small strings of a few hundred
-  characters at most. There are times, however, when the strings are very much
-  longer (for example, a lookup that returns a vast number of alias addresses).
-  To try to keep things reasonable, we use increments whose size depends on the
-  existing length of the string. */
-
-  int inc = (oldsize < 4096)? 100 : 1024;
-  while (*size <= p + count) *size += inc;
-
-  /* New string */
-
-  if (string == NULL) string = store_get(*size);
-
-  /* Try to extend an existing allocation. If the result of calling
-  store_extend() is false, either there isn't room in the current memory block,
-  or this string is not the top item on the dynamic store stack. We then have
-  to get a new chunk of store and copy the old string. When building large
-  strings, it is helpful to call store_release() on the old string, to release
-  memory blocks that have become empty. (The block will be freed if the string
-  is at its start.) However, we can do this only if we know that the old string
-  was the last item on the dynamic memory stack. This is the case if it matches
-  store_last_get. */
-
-  else if (!store_extend(string, oldsize, *size))
-    {
-    BOOL release_ok = store_last_get[store_pool] == string;
-    uschar *newstring = store_get(*size);
-    memcpy(newstring, string, p);
-    if (release_ok) store_release(string);
-    string = newstring;
-    }
+  unsigned inc = count < 4096 ? 127 : 1023;
+  unsigned size = ((count + inc) &  ~inc) + 1;
+  g = string_get_tainted(size, srctaint);

   }
   }

+else if (srctaint && !is_tainted(g->s))
+  gstring_rebuffer(g);
+
+p = g->ptr;
+if (p + count >= g->size)
+  gstring_grow(g, count);

 
 /* Because we always specify the exact number of characters to copy, we can
 use memcpy(), which is likely to be more efficient than strncopy() because the
 latter has to check for zero bytes. */
 
 
 /* Because we always specify the exact number of characters to copy, we can
 use memcpy(), which is likely to be more efficient than strncopy() because the
 latter has to check for zero bytes. */
 

-memcpy(string + p, s, count);
-*ptr = p + count;
-return string;
+memcpy(g->s + p, s, count);
+g->ptr = p + count;
+return g;
+}
+
+
+gstring *
+string_cat(gstring *string, const uschar *s)
+{
+return string_catn(string, s, Ustrlen(s));

 }
 }

-#endif  /* COMPILE_UTILITY */

 
 
 
 
 
 

-#ifndef COMPILE_UTILITY

 /*************************************************
 *        Append strings to another string        *
 *************************************************/
 /*************************************************
 *        Append strings to another string        *
 *************************************************/


@@ -1151,12 +1159,8 @@ return string;
 It calls string_cat() to do the dirty work.
 
 Arguments:
 It calls string_cat() to do the dirty work.
 
 Arguments:

-  string   points to the start of the string that is being built, or NULL
+  string   expanding-string that is being built, or NULL

              if this is a new string that has no contents yet
              if this is a new string that has no contents yet

-  size     points to a variable that holds the current capacity of the memory
-             block (updated if changed)
-  ptr      points to a variable that holds the offset at which to add
-             characters, updated to the new offset

   count    the number of strings to append
   ...      "count" uschar* arguments, which must be valid zero-terminated
              C strings
   count    the number of strings to append
   ...      "count" uschar* arguments, which must be valid zero-terminated
              C strings


@@ -1165,17 +1169,16 @@ Returns:   pointer to the start of the string, changed if copied for expansion.
            The string is not zero-terminated - see string_cat() above.
 */
 
            The string is not zero-terminated - see string_cat() above.
 */
 

-uschar *
-string_append(uschar *string, int *size, int *ptr, int count, ...)
+__inline__ gstring *
+string_append(gstring *string, int count, ...)

 {
 va_list ap;
 {
 va_list ap;

-int i;

 
 va_start(ap, count);
 
 va_start(ap, count);

-for (i = 0; i < count; i++)
+while (count-- > 0)

   {
   uschar *t = va_arg(ap, uschar *);
   {
   uschar *t = va_arg(ap, uschar *);

-  string = string_cat(string, size, ptr, t, Ustrlen(t));
+  string = string_cat(string, t);

   }
 va_end(ap);
 
   }
 va_end(ap);
 


@@ -1197,10 +1200,10 @@ on whether the variable length list of data arguments are given explicitly or
 as a va_list item.
 
 The formats are the usual printf() ones, with some omissions (never used) and
 as a va_list item.
 
 The formats are the usual printf() ones, with some omissions (never used) and

-two additions for strings: %S forces lower case, and %#s or %#S prints nothing
-for a NULL string. Without the # "NULL" is printed (useful in debugging). There
-is also the addition of %D and %M, which insert the date in the form used for
-datestamped log files.
+three additions for strings: %S forces lower case, %T forces upper case, and
+%#s or %#S prints nothing for a NULL string. Without the # "NULL" is printed
+(useful in debugging). There is also the addition of %D and %M, which insert
+the date in the form used for datestamped log files.

 
 Arguments:
   buffer       a buffer in which to put the formatted string
 
 Arguments:
   buffer       a buffer in which to put the formatted string


@@ -1212,50 +1215,107 @@ Returns:       TRUE if the result fitted in the buffer
 */
 
 BOOL
 */
 
 BOOL

-string_format(uschar *buffer, int buflen, const char *format, ...)
+string_format_trc(uschar * buffer, int buflen,
+  const uschar * func, unsigned line, const char * format, ...)

 {
 {

-BOOL yield;
+gstring g = { .size = buflen, .ptr = 0, .s = buffer }, *gp;

 va_list ap;
 va_start(ap, format);
 va_list ap;
 va_start(ap, format);

-yield = string_vformat(buffer, buflen, format, ap);
+gp = string_vformat_trc(&g, func, line, STRING_SPRINTF_BUFFER_SIZE,
+       0, format, ap);

 va_end(ap);
 va_end(ap);

-return yield;
+g.s[g.ptr] = '\0';
+return !!gp;

 }
 
 
 }
 
 

-BOOL
-string_vformat(uschar *buffer, int buflen, const char *format, va_list ap)
+
+/* Copy the content of a string to tainted memory */
+static void
+gstring_rebuffer(gstring * g)

 {
 {

-/* We assume numbered ascending order, C does not guarantee that */
-enum { L_NORMAL=1, L_SHORT=2, L_LONG=3, L_LONGLONG=4, L_LONGDOUBLE=5, L_SIZE=6 };
+uschar * s = store_get(g->size, TRUE);
+memcpy(s, g->s, g->ptr);
+g->s = s;
+}
+
+
+
+/* Build or append to a growing-string, sprintf-style.

 
 

-BOOL yield = TRUE;
-int width, precision;
-const char *fp = format;       /* Deliberately not unsigned */
-uschar *p = buffer;
-uschar *last = buffer + buflen - 1;
+If the "extend" flag is true, the string passed in can be NULL,
+empty, or non-empty.  Growing is subject to an overall limit given
+by the size_limit argument.

 
 

-string_datestamp_offset = -1;  /* Datestamp not inserted */
-string_datestamp_length = 0;   /* Datestamp not inserted */
-string_datestamp_type = 0;     /* Datestamp not inserted */
+If the "extend" flag is false, the string passed in may not be NULL,
+will not be grown, and is usable in the original place after return.
+The return value can be NULL to signify overflow.
+
+Returns the possibly-new (if copy for growth was needed) string,
+not nul-terminated.
+*/
+
+gstring *
+string_vformat_trc(gstring * g, const uschar * func, unsigned line,
+  unsigned size_limit, unsigned flags, const char *format, va_list ap)
+{
+enum ltypes { L_NORMAL=1, L_SHORT=2, L_LONG=3, L_LONGLONG=4, L_LONGDOUBLE=5, L_SIZE=6 };
+
+int width, precision, off, lim, need;
+const char * fp = format;      /* Deliberately not unsigned */
+BOOL dest_tainted = FALSE;
+
+string_datestamp_offset = -1;  /* Datestamp not inserted */
+string_datestamp_length = 0;   /* Datestamp not inserted */
+string_datestamp_type = 0;     /* Datestamp not inserted */
+
+#ifdef COMPILE_UTILITY
+assert(!(flags & SVFMT_EXTEND));
+assert(g);
+#else
+
+/* Ensure we have a string, to save on checking later */
+if (!g) g = string_get(16);
+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;
+  }
+#endif /*!COMPILE_UTILITY*/
+
+lim = g->size - 1;     /* leave one for a nul */
+off = g->ptr;          /* remember initial offset in gstring */

 
 /* Scan the format and handle the insertions */
 
 
 /* Scan the format and handle the insertions */
 

-while (*fp != 0)
+while (*fp)

   {
   int length = L_NORMAL;
   int *nptr;
   int slen;
   {
   int length = L_NORMAL;
   int *nptr;
   int slen;

-  const char *null = "NULL";   /* ) These variables */
-  const char *item_start, *s;  /* ) are deliberately */
-  char newformat[16];          /* ) not unsigned */
+  const char *null = "NULL";           /* ) These variables */
+  const char *item_start, *s;          /* ) are deliberately */
+  char newformat[16];                  /* ) not unsigned */
+  char * gp = CS g->s + g->ptr;                /* ) */

 
   /* Non-% characters just get copied verbatim */
 
   if (*fp != '%')
     {
 
   /* Non-% characters just get copied verbatim */
 
   if (*fp != '%')
     {

-    if (p >= last) { yield = FALSE; break; }
-    *p++ = (uschar)*fp++;
+    /* Avoid string_copyn() due to COMPILE_UTILITY */
+    if ((need = g->ptr + 1) > lim)
+      {
+      if (!(flags & SVFMT_EXTEND) || need > size_limit) return NULL;
+      gstring_grow(g, 1);
+      lim = g->size - 1;
+      }
+    g->s[g->ptr++] = (uschar) *fp++;

     continue;
     }
 
     continue;
     }
 


@@ -1283,19 +1343,14 @@ while (*fp != 0)
     }
 
   if (*fp == '.')
     }
 
   if (*fp == '.')

-    {

     if (*(++fp) == '*')
       {
       precision = va_arg(ap, int);
       fp++;
       }
     else
     if (*(++fp) == '*')
       {
       precision = va_arg(ap, int);
       fp++;
       }
     else

-      {
-      precision = 0;
-      while (isdigit((uschar)*fp))
-        precision = precision*10 + *fp++ - '0';
-      }
-    }
+      for (precision = 0; isdigit((uschar)*fp); fp++)
+        precision = precision*10 + *fp - '0';

 
   /* Skip over 'h', 'L', 'l', 'll' and 'z', remembering the item length */
 
 
   /* Skip over 'h', 'L', 'l', 'll' and 'z', remembering the item length */
 


@@ -1304,18 +1359,10 @@ while (*fp != 0)
   else if (*fp == 'L')
     { fp++; length = L_LONGDOUBLE; }
   else if (*fp == 'l')
   else if (*fp == 'L')
     { fp++; length = L_LONGDOUBLE; }
   else if (*fp == 'l')

-    {

     if (fp[1] == 'l')
     if (fp[1] == 'l')

-      {
-      fp += 2;
-      length = L_LONGLONG;
-      }
+      { fp += 2; length = L_LONGLONG; }

     else
     else

-      {
-      fp++;
-      length = L_LONG;
-      }
-    }
+      { fp++; length = L_LONG; }

   else if (*fp == 'z')
     { fp++; length = L_SIZE; }
 
   else if (*fp == 'z')
     { fp++; length = L_SIZE; }
 


@@ -1324,40 +1371,64 @@ while (*fp != 0)
   switch (*fp++)
     {
     case 'n':
   switch (*fp++)
     {
     case 'n':

-    nptr = va_arg(ap, int *);
-    *nptr = p - buffer;
-    break;
+      nptr = va_arg(ap, int *);
+      *nptr = g->ptr - off;
+      break;

 
     case 'd':
     case 'o':
     case 'u':
     case 'x':
     case 'X':
 
     case 'd':
     case 'o':
     case 'u':
     case 'x':
     case 'X':

-    if (p >= last - ((length > L_LONG)? 24 : 12))
-      { yield = FALSE; goto END_FORMAT; }
-    strncpy(newformat, item_start, fp - item_start);
-    newformat[fp - item_start] = 0;
-
-    /* Short int is promoted to int when passing through ..., so we must use
-    int for va_arg(). */
+      width = length > L_LONG ? 24 : 12;
+      if ((need = g->ptr + width) > lim)
+       {
+       if (!(flags & SVFMT_EXTEND) || need >= size_limit) return NULL;
+       gstring_grow(g, width);
+       lim = g->size - 1;
+       gp = CS g->s + g->ptr;
+       }
+      strncpy(newformat, item_start, fp - item_start);
+      newformat[fp - item_start] = 0;
+
+      /* Short int is promoted to int when passing through ..., so we must use
+      int for va_arg(). */
+
+      switch(length)
+       {
+       case L_SHORT:
+       case L_NORMAL:
+         g->ptr += sprintf(gp, newformat, va_arg(ap, int)); break;
+       case L_LONG:
+         g->ptr += sprintf(gp, newformat, va_arg(ap, long int)); break;
+       case L_LONGLONG:
+         g->ptr += sprintf(gp, newformat, va_arg(ap, LONGLONG_T)); break;
+       case L_SIZE:
+         g->ptr += sprintf(gp, newformat, va_arg(ap, size_t)); break;
+       }
+      break;

 
 

-    switch(length)
+    case 'p':

       {
       {

-      case L_SHORT:
-      case L_NORMAL:   sprintf(CS p, newformat, va_arg(ap, int)); break;
-      case L_LONG:     sprintf(CS p, newformat, va_arg(ap, long int)); break;
-      case L_LONGLONG: sprintf(CS p, newformat, va_arg(ap, LONGLONG_T)); break;
-      case L_SIZE:     sprintf(CS p, newformat, va_arg(ap, size_t)); break;
+      void * ptr;
+      if ((need = g->ptr + 24) > lim)
+       {
+       if (!(flags & SVFMT_EXTEND || need >= size_limit)) return NULL;
+       gstring_grow(g, 24);
+       lim = g->size - 1;
+       gp = CS g->s + g->ptr;
+       }
+      /* sprintf() saying "(nil)" for a null pointer seems unreliable.
+      Handle it explicitly. */
+      if ((ptr = va_arg(ap, void *)))
+       {
+       strncpy(newformat, item_start, fp - item_start);
+       newformat[fp - item_start] = 0;
+       g->ptr += sprintf(gp, newformat, ptr);
+       }
+      else
+       g->ptr += sprintf(gp, "(nil)");

       }
       }

-    while (*p) p++;
-    break;
-
-    case 'p':
-    if (p >= last - 24) { yield = FALSE; goto END_FORMAT; }
-    strncpy(newformat, item_start, fp - item_start);
-    newformat[fp - item_start] = 0;
-    sprintf(CS p, newformat, va_arg(ap, void *));
-    while (*p) p++;

     break;
 
     /* %f format is inherently insecure if the numbers that it may be
     break;
 
     /* %f format is inherently insecure if the numbers that it may be


@@ -1372,116 +1443,148 @@ while (*fp != 0)
     case 'E':
     case 'g':
     case 'G':
     case 'E':
     case 'g':
     case 'G':

-    if (precision < 0) precision = 6;
-    if (p >= last - precision - 8) { yield = FALSE; goto END_FORMAT; }
-    strncpy(newformat, item_start, fp - item_start);
-    newformat[fp-item_start] = 0;
-    if (length == L_LONGDOUBLE)
-      sprintf(CS p, newformat, va_arg(ap, long double));
-    else
-      sprintf(CS p, newformat, va_arg(ap, double));
-    while (*p) p++;
-    break;
+      if (precision < 0) precision = 6;
+      if ((need = g->ptr + precision + 8) > lim)
+       {
+       if (!(flags & SVFMT_EXTEND || need >= size_limit)) return NULL;
+       gstring_grow(g, precision+8);
+       lim = g->size - 1;
+       gp = CS g->s + g->ptr;
+       }
+      strncpy(newformat, item_start, fp - item_start);
+      newformat[fp-item_start] = 0;
+      if (length == L_LONGDOUBLE)
+       g->ptr += sprintf(gp, newformat, va_arg(ap, long double));
+      else
+       g->ptr += sprintf(gp, newformat, va_arg(ap, double));
+      break;

 
     /* String types */
 
     case '%':
 
     /* String types */
 
     case '%':

-    if (p >= last) { yield = FALSE; goto END_FORMAT; }
-    *p++ = '%';
-    break;
+      if ((need = g->ptr + 1) > lim)
+       {
+       if (!(flags & SVFMT_EXTEND || need >= size_limit)) return NULL;
+       gstring_grow(g, 1);
+       lim = g->size - 1;
+       }
+      g->s[g->ptr++] = (uschar) '%';
+      break;

 
     case 'c':
 
     case 'c':

-    if (p >= last) { yield = FALSE; goto END_FORMAT; }
-    *p++ = va_arg(ap, int);
-    break;
+      if ((need = g->ptr + 1) > lim)
+       {
+       if (!(flags & SVFMT_EXTEND || need >= size_limit)) return NULL;
+       gstring_grow(g, 1);
+       lim = g->size - 1;
+       }
+      g->s[g->ptr++] = (uschar) va_arg(ap, int);
+      break;

 
     case 'D':                   /* Insert daily datestamp for log file names */
 
     case 'D':                   /* Insert daily datestamp for log file names */

-    s = CS tod_stamp(tod_log_datestamp_daily);
-    string_datestamp_offset = p - buffer;   /* Passed back via global */
-    string_datestamp_length = Ustrlen(s);   /* Passed back via global */
-    string_datestamp_type = tod_log_datestamp_daily;
-    slen = string_datestamp_length;
-    goto INSERT_STRING;
+      s = CS tod_stamp(tod_log_datestamp_daily);
+      string_datestamp_offset = g->ptr;                /* Passed back via global */
+      string_datestamp_length = Ustrlen(s);    /* Passed back via global */
+      string_datestamp_type = tod_log_datestamp_daily;
+      slen = string_datestamp_length;
+      goto INSERT_STRING;

 
     case 'M':                   /* Insert monthly datestamp for log file names */
 
     case 'M':                   /* Insert monthly datestamp for log file names */

-    s = CS tod_stamp(tod_log_datestamp_monthly);
-    string_datestamp_offset = p - buffer;   /* Passed back via global */
-    string_datestamp_length = Ustrlen(s);   /* Passed back via global */
-    string_datestamp_type = tod_log_datestamp_monthly;
-    slen = string_datestamp_length;
-    goto INSERT_STRING;
+      s = CS tod_stamp(tod_log_datestamp_monthly);
+      string_datestamp_offset = g->ptr;                /* Passed back via global */
+      string_datestamp_length = Ustrlen(s);    /* Passed back via global */
+      string_datestamp_type = tod_log_datestamp_monthly;
+      slen = string_datestamp_length;
+      goto INSERT_STRING;

 
     case 's':
     case 'S':                   /* Forces *lower* case */
 
     case 's':
     case 'S':                   /* Forces *lower* case */

-    s = va_arg(ap, char *);
-
-    if (s == NULL) s = null;
-    slen = Ustrlen(s);
+    case 'T':                   /* Forces *upper* case */
+      s = va_arg(ap, char *);
+
+      if (!s) s = null;
+      slen = Ustrlen(s);
+
+      if (!(flags & SVFMT_TAINT_NOCHK) && !dest_tainted && is_tainted(s))
+       if (flags & SVFMT_REBUFFER)
+         {
+         gstring_rebuffer(g);
+         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 */
 
 
     INSERT_STRING:              /* Come to from %D or %M above */
 

-    /* If the width is specified, check that there is a precision
-    set; if not, set it to the width to prevent overruns of long
-    strings. */
-
-    if (width >= 0)

       {
       {

-      if (precision < 0) precision = width;
-      }
+      BOOL truncated = FALSE;

 
 

-    /* If a width is not specified and the precision is specified, set
-    the width to the precision, or the string length if shorted. */
+      /* If the width is specified, check that there is a precision
+      set; if not, set it to the width to prevent overruns of long
+      strings. */

 
 

-    else if (precision >= 0)
-      {
-      width = (precision < slen)? precision : slen;
-      }
+      if (width >= 0)
+       {
+       if (precision < 0) precision = width;
+       }

 
 

-    /* If neither are specified, set them both to the string length. */
+      /* If a width is not specified and the precision is specified, set
+      the width to the precision, or the string length if shorted. */

 
 

-    else width = precision = slen;
+      else if (precision >= 0)
+       width = precision < slen ? precision : slen;

 
 

-    /* Check string space, and add the string to the buffer if ok. If
-    not OK, add part of the string (debugging uses this to show as
-    much as possible). */
+      /* If neither are specified, set them both to the string length. */

 
 

-    if (p == last)
-      {
-      yield = FALSE;
-      goto END_FORMAT;
-      }
-    if (p >= last - width)
-      {
-      yield = FALSE;
-      width = precision = last - p - 1;
-      if (width < 0) width = 0;
-      if (precision < 0) precision = 0;
+      else
+       width = precision = slen;
+
+      if ((need = g->ptr + width) >= size_limit || !(flags & SVFMT_EXTEND))
+       {
+       if (g->ptr == lim) return NULL;
+       if (need > lim)
+         {
+         truncated = TRUE;
+         width = precision = lim - g->ptr - 1;
+         if (width < 0) width = 0;
+         if (precision < 0) precision = 0;
+         }
+       }
+      else if (need > lim)
+       {
+       gstring_grow(g, width);
+       lim = g->size - 1;
+       gp = CS g->s + g->ptr;
+       }
+
+      g->ptr += sprintf(gp, "%*.*s", width, precision, s);
+      if (fp[-1] == 'S')
+       while (*gp) { *gp = tolower(*gp); gp++; }
+      else if (fp[-1] == 'T')
+       while (*gp) { *gp = toupper(*gp); gp++; }
+
+      if (truncated) return NULL;
+      break;

       }
       }

-    sprintf(CS p, "%*.*s", width, precision, s);
-    if (fp[-1] == 'S')
-      while (*p) { *p = tolower(*p); p++; }
-    else
-      while (*p) p++;
-    if (!yield) goto END_FORMAT;
-    break;

 
     /* Some things are never used in Exim; also catches junk. */
 
     default:
 
     /* Some things are never used in Exim; also catches junk. */
 
     default:

-    strncpy(newformat, item_start, fp - item_start);
-    newformat[fp-item_start] = 0;
-    log_write(0, LOG_MAIN|LOG_PANIC_DIE, "string_format: unsupported type "
-      "in \"%s\" in \"%s\"", newformat, format);
-    break;
+      strncpy(newformat, item_start, fp - item_start);
+      newformat[fp-item_start] = 0;
+      log_write(0, LOG_MAIN|LOG_PANIC_DIE, "string_format: unsupported type "
+       "in \"%s\" in \"%s\"", newformat, format);
+      break;

     }
   }
 
     }
   }
 

-/* Ensure string is complete; return TRUE if got to the end of the format */
-
-END_FORMAT:
-
-*p = 0;
-return yield;
+if (g->ptr > g->size)
+  log_write(0, LOG_MAIN|LOG_PANIC_DIE,
+    "string_format internal error: caller %s %d", func, line);
+return g;

 }
 
 
 }
 
 


@@ -1504,208 +1607,35 @@ Returns:        a message, in dynamic store
 */
 
 uschar *
 */
 
 uschar *

-string_open_failed(int eno, const char *format, ...)
+string_open_failed_trc(int eno, const uschar * func, unsigned line,
+  const char *format, ...)

 {
 va_list ap;
 {
 va_list ap;

-uschar buffer[1024];
+gstring * g = string_get(1024);

 
 

-Ustrcpy(buffer, "failed to open ");
-va_start(ap, format);
+g = string_catn(g, US"failed to open ", 15);

 
 /* Use the checked formatting routine to ensure that the buffer
 does not overflow. It should not, since this is called only for internally
 specified messages. If it does, the message just gets truncated, and there
 doesn't seem much we can do about that. */
 
 
 /* Use the checked formatting routine to ensure that the buffer
 does not overflow. It should not, since this is called only for internally
 specified messages. If it does, the message just gets truncated, and there
 doesn't seem much we can do about that. */
 

-(void)string_vformat(buffer+15, sizeof(buffer) - 15, format, ap);
+va_start(ap, format);
+(void) string_vformat_trc(g, func, line, STRING_SPRINTF_BUFFER_SIZE,
+       0, format, ap);
+string_from_gstring(g);
+gstring_release_unused(g);

 va_end(ap);
 
 va_end(ap);
 

-return (eno == EACCES)?
-  string_sprintf("%s: %s (euid=%ld egid=%ld)", buffer, strerror(eno),
-    (long int)geteuid(), (long int)getegid()) :
-  string_sprintf("%s: %s", buffer, strerror(eno));
+return eno == EACCES
+  ? string_sprintf("%s: %s (euid=%ld egid=%ld)", g->s, strerror(eno),
+    (long int)geteuid(), (long int)getegid())
+  : string_sprintf("%s: %s", g->s, strerror(eno));

 }
 #endif  /* COMPILE_UTILITY */
 
 
 
 }
 #endif  /* COMPILE_UTILITY */
 
 
 

-#ifndef COMPILE_UTILITY
-/*************************************************
-*        Generate local prt for logging          *
-*************************************************/
-
-/* This function is a subroutine for use in string_log_address() below.
-
-Arguments:
-  addr        the address being logged
-  yield       the current dynamic buffer pointer
-  sizeptr     points to current size
-  ptrptr      points to current insert pointer
-
-Returns:      the new value of the buffer pointer
-*/
-
-static uschar *
-string_get_localpart(address_item *addr, uschar *yield, int *sizeptr,
-  int *ptrptr)
-{
-uschar * s;
-
-s = addr->prefix;
-if (testflag(addr, af_include_affixes) && s)
-  {
-#ifdef SUPPORT_I18N
-  if (testflag(addr, af_utf8_downcvt))
-    s = string_localpart_utf8_to_alabel(s, NULL);
-#endif
-  yield = string_cat(yield, sizeptr, ptrptr, s, Ustrlen(s));
-  }
-
-s = addr->local_part;
-#ifdef SUPPORT_I18N
-if (testflag(addr, af_utf8_downcvt))
-  s = string_localpart_utf8_to_alabel(s, NULL);
-#endif
-yield = string_cat(yield, sizeptr, ptrptr, s, Ustrlen(s));
-
-s = addr->suffix;
-if (testflag(addr, af_include_affixes) && s)
-  {
-#ifdef SUPPORT_I18N
-  if (testflag(addr, af_utf8_downcvt))
-    s = string_localpart_utf8_to_alabel(s, NULL);
-#endif
-  yield = string_cat(yield, sizeptr, ptrptr, s, Ustrlen(s));
-  }
-
-return yield;
-}
-
-
-/*************************************************
-*          Generate log address list             *
-*************************************************/
-
-/* This function generates a list consisting of an address and its parents, for
-use in logging lines. For saved onetime aliased addresses, the onetime parent
-field is used. If the address was delivered by a transport with rcpt_include_
-affixes set, the af_include_affixes bit will be set in the address. In that
-case, we include the affixes here too.
-
-Arguments:
-  addr          bottom (ultimate) address
-  all_parents   if TRUE, include all parents
-  success       TRUE for successful delivery
-
-Returns:        a string in dynamic store
-*/
-
-uschar *
-string_log_address(address_item *addr, BOOL all_parents, BOOL success)
-{
-int size = 64;
-int ptr = 0;
-BOOL add_topaddr = TRUE;
-uschar *yield = store_get(size);
-address_item *topaddr;
-
-/* Find the ultimate parent */
-
-for (topaddr = addr; topaddr->parent != NULL; topaddr = topaddr->parent);
-
-/* We start with just the local part for pipe, file, and reply deliveries, and
-for successful local deliveries from routers that have the log_as_local flag
-set. File deliveries from filters can be specified as non-absolute paths in
-cases where the transport is goin to complete the path. If there is an error
-before this happens (expansion failure) the local part will not be updated, and
-so won't necessarily look like a path. Add extra text for this case. */
-
-if (testflag(addr, af_pfr) ||
-      (success &&
-       addr->router != NULL && addr->router->log_as_local &&
-       addr->transport != NULL && addr->transport->info->local))
-  {
-  if (testflag(addr, af_file) && addr->local_part[0] != '/')
-    yield = string_cat(yield, &size, &ptr, CUS"save ", 5);
-  yield = string_get_localpart(addr, yield, &size, &ptr);
-  }
-
-/* Other deliveries start with the full address. It we have split it into local
-part and domain, use those fields. Some early failures can happen before the
-splitting is done; in those cases use the original field. */
-
-else
-  {
-  if (addr->local_part != NULL)
-    {
-    const uschar * s;
-    yield = string_get_localpart(addr, yield, &size, &ptr);
-    yield = string_cat(yield, &size, &ptr, US"@", 1);
-    s = addr->domain;
-#ifdef SUPPORT_I18N
-    if (testflag(addr, af_utf8_downcvt))
-      s = string_localpart_utf8_to_alabel(s, NULL);
-#endif
-    yield = string_cat(yield, &size, &ptr, s, Ustrlen(s) );
-    }
-  else
-    {
-    yield = string_cat(yield, &size, &ptr, addr->address, Ustrlen(addr->address));
-    }
-  yield[ptr] = 0;
-
-  /* If the address we are going to print is the same as the top address,
-  and all parents are not being included, don't add on the top address. First
-  of all, do a caseless comparison; if this succeeds, do a caseful comparison
-  on the local parts. */
-
-  if (strcmpic(yield, topaddr->address) == 0 &&
-      Ustrncmp(yield, topaddr->address, Ustrchr(yield, '@') - yield) == 0 &&
-      addr->onetime_parent == NULL &&
-      (!all_parents || addr->parent == NULL || addr->parent == topaddr))
-    add_topaddr = FALSE;
-  }
-
-/* If all parents are requested, or this is a local pipe/file/reply, and
-there is at least one intermediate parent, show it in brackets, and continue
-with all of them if all are wanted. */
-
-if ((all_parents || testflag(addr, af_pfr)) &&
-    addr->parent != NULL &&
-    addr->parent != topaddr)
-  {
-  uschar *s = US" (";
-  address_item *addr2;
-  for (addr2 = addr->parent; addr2 != topaddr; addr2 = addr2->parent)
-    {
-    yield = string_cat(yield, &size, &ptr, s, 2);
-    yield = string_cat(yield, &size, &ptr, addr2->address, Ustrlen(addr2->address));
-    if (!all_parents) break;
-    s = US", ";
-    }
-  yield = string_cat(yield, &size, &ptr, US")", 1);
-  }
-
-/* Add the top address if it is required */
-
-if (add_topaddr)
-  {
-  yield = string_cat(yield, &size, &ptr, US" <", 2);
-
-  if (addr->onetime_parent == NULL)
-    yield = string_cat(yield, &size, &ptr, topaddr->address,
-      Ustrlen(topaddr->address));
-  else
-    yield = string_cat(yield, &size, &ptr, addr->onetime_parent,
-      Ustrlen(addr->onetime_parent));
-
-  yield = string_cat(yield, &size, &ptr, US">", 1);
-  }
-
-yield[ptr] = 0;  /* string_cat() leaves space */
-return yield;
-}
-#endif  /* COMPILE_UTILITY */

 
 
 #ifndef COMPILE_UTILITY
 
 
 #ifndef COMPILE_UTILITY


@@ -1722,6 +1652,7 @@ return Ustrcmp(* CUSS a, * CUSS b);
 
 
 
 
 
 

+

 /*************************************************
 **************************************************
 *             Stand-alone test program           *
 /*************************************************
 **************************************************
 *             Stand-alone test program           *