Convert more cases of list-walking to use self-assigned memory for the list-item

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

diff --git a/src/src/expand.c b/src/src/expand.c
index 839821ef7e4ebbff6b44a4ad74d1463ec1cb0f13..e8e97dab8c4c5b9dd6944401360ab847fc581f94 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -7251,7 +7251,9 @@ while (*s)
        uschar * item;
        uschar * suffix = US"";
        BOOL needsep = FALSE;
-       uschar buffer[256];
+#define LISTNAMED_BUF_SIZE 256
+       uschar b[LISTNAMED_BUF_SIZE];
+       uschar * buffer = b;
 
        if (*sub == '+') sub++;
        if (!arg)               /* no-argument version */
@@ -7286,7 +7288,11 @@ while (*s)
 
        list = ((namedlist_block *)(t->data.ptr))->string;
 
-       while ((item = string_nextinlist(&list, &sep, buffer, sizeof(buffer))))
+       /* The list could be quite long so we (re)use a buffer for each element
+       rather than getting each in new memory */
+
+       if (is_tainted(list)) buffer = store_get(LISTNAMED_BUF_SIZE, TRUE);
+       while ((item = string_nextinlist(&list, &sep, buffer, LISTNAMED_BUF_SIZE)))
          {
          uschar * buf = US" : ";
          if (needsep)