From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 24 Dec 2020 21:05:40 +0000 (+0000)
Subject: Expansions: Reduce memory use of ${listcount }
X-Git-Tag: exim-4.95-RC0~178
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/71c8c2ef07fabc64c4b56b6eee1eeffb88a8f5e0

Expansions: Reduce memory use of ${listcount }
---

diff --git a/src/src/expand.c b/src/src/expand.c
index 37276dd69..8be7bf97b 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -7324,10 +7324,10 @@ while (*s)
 
       case EOP_LISTCOUNT:
         {
-	int cnt = 0;
-	int sep = 0;
+	int cnt = 0, sep = 0;
+	uschar * buf = store_get(2, is_tainted(sub));
 
-	while (string_nextinlist(CUSS &sub, &sep, NULL, 0)) cnt++;
+	while (string_nextinlist(CUSS &sub, &sep, buf, 1)) cnt++;
 	yield = string_fmt_append(yield, "%d", cnt);
         continue;
         }