From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 17 Sep 2021 13:10:12 +0000 (+0300)
Subject: lib: Optimize p_strsplit_tabescaped()
X-Git-Tag: 2.3.17~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcfc14fae3323541c88e7943b55c07d2f1313364;p=thirdparty%2Fdovecot%2Fcore.git

lib: Optimize p_strsplit_tabescaped()
---

diff --git a/src/lib/strescape.c b/src/lib/strescape.c
index 0d2fc1c50b..54d44ec235 100644
--- a/src/lib/strescape.c
+++ b/src/lib/strescape.c
@@ -295,17 +295,19 @@ const char *t_str_tabunescape(const char *str)
 	return str_tabunescape_from(dest, dest + (p - str));
 }
 
-const char *const *t_strsplit_tabescaped_inplace(char *data)
+static char **p_strsplit_tabescaped_inplace(pool_t pool, char *data)
 {
 	/* @UNSAFE */
 	char **array;
 	unsigned int count, new_alloc_count, alloc_count;
 
 	if (*data == '\0')
-		return t_new(const char *, 1);
+		return p_new(pool, char *, 1);
 
 	alloc_count = 32;
-	array = t_malloc_no0(sizeof(char *) * alloc_count);
+	array = pool == unsafe_data_stack_pool ?
+		t_malloc_no0(sizeof(char *) * alloc_count) :
+		p_malloc(pool, sizeof(char *) * alloc_count);
 
 	array[0] = data; count = 1;
 	char *need_unescape = NULL;
@@ -319,7 +321,7 @@ const char *const *t_strsplit_tabescaped_inplace(char *data)
 		}
 		if (count+1 >= alloc_count) {
 			new_alloc_count = nearest_power(alloc_count+1);
-			array = p_realloc(unsafe_data_stack_pool, array,
+			array = p_realloc(pool, array,
 					  sizeof(char *) * alloc_count,
 					  sizeof(char *) *
 					  new_alloc_count);
@@ -337,18 +339,19 @@ const char *const *t_strsplit_tabescaped_inplace(char *data)
 	i_assert(count < alloc_count);
 	array[count] = NULL;
 
-	return (const char *const *)array;
+	return array;
 }
 
-char **p_strsplit_tabescaped(pool_t pool, const char *str)
+const char *const *t_strsplit_tabescaped_inplace(char *data)
 {
-	char **args;
-	unsigned int i;
+	char *const *escaped =
+		p_strsplit_tabescaped_inplace(unsafe_data_stack_pool, data);
+	return (const char *const *)escaped;
+}
 
-	args = p_strsplit(pool, str, "\t");
-	for (i = 0; args[i] != NULL; i++)
-		args[i] = str_tabunescape(args[i]);
-	return args;
+char **p_strsplit_tabescaped(pool_t pool, const char *str)
+{
+	return p_strsplit_tabescaped_inplace(pool, p_strdup(pool, str));
 }
 
 const char *const *t_strsplit_tabescaped(const char *str)