Fix $regex<n> use-after-free. Bug 2915

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

diff --git a/src/src/utf8.c b/src/src/utf8.c
index f035dafd042c2e6c16603d5e9eac4b067e415a6d..bc7adb828dea574b3b7a60f7cdbd87b95a0023b3 100644 (file)
--- a/src/src/utf8.c
+++ b/src/src/utf8.c
@@ -2,6 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
+/* Copyright (c) The Exim Maintainers 2022 */
 /* Copyright (c) Jeremy Harris 2015 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 
@@ -148,7 +149,7 @@ if (!p || !ucs4_len)
   return NULL;
   }
 p_len = ucs4_len*4;    /* this multiplier is pure guesswork */
-res = store_get(p_len+5, is_tainted(utf8));
+res = store_get(p_len+5, utf8);
 
 res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
 
@@ -177,7 +178,7 @@ uschar * s, * res;
 DEBUG(D_expand) debug_printf("l_a2u: '%s'\n", alabel);
 alabel += 4;
 p_len = Ustrlen(alabel);
-p = store_get((p_len+1) * sizeof(*p), is_tainted(alabel));
+p = store_get((p_len+1) * sizeof(*p), alabel);
 
 if ((rc = punycode_decode(p_len, CCS alabel, &p_len, p, NULL)) != PUNYCODE_SUCCESS)
   {