From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 20 Jan 2021 18:45:11 +0000 (+0200)
Subject: lib-program-client, script: Use env_put_array()
X-Git-Tag: 2.3.16~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=990bb780a35941306fa5e1ecc2aa3804f25dbf89;p=thirdparty%2Fdovecot%2Fcore.git

lib-program-client, script: Use env_put_array()
---

diff --git a/src/lib-program-client/program-client-local.c b/src/lib-program-client/program-client-local.c
index de5b680c9d..ed7e9f05d4 100644
--- a/src/lib-program-client/program-client-local.c
+++ b/src/lib-program-client/program-client-local.c
@@ -121,10 +121,8 @@ exec_child(const char *bin_path, const char *const *args,
 
 	env_clean();
 	if (array_is_created(envs)) {
-		const char *env;
-
-		array_foreach_elem(envs, env)
-			env_put(env);
+		array_append_zero(envs);
+		env_put_array(array_front(envs));
 	}
 
 	/* Execute */
diff --git a/src/util/script.c b/src/util/script.c
index 45f53ee494..6ae4621dc7 100644
--- a/src/util/script.c
+++ b/src/util/script.c
@@ -62,10 +62,8 @@ exec_child(struct master_service_connection *conn,
 	array_append_zero(&exec_args);
 
 	env_clean();
-	if (envs != NULL) {
-		for(; *envs != NULL; envs++)
-			env_put(*envs);
-        }
+	if (envs != NULL)
+		env_put_array(envs);
 
 	args = array_front(&exec_args);
 	execvp_const(args[0], args);