commit 1aadb47aad7f4648a1de1e2de84cbcf235eeff59
author Junio C Hamano <gitster@pobox.com> Wed Sep 09 13:53:07 2020 -0700
committer Junio C Hamano <gitster@pobox.com> Wed Sep 09 13:53:07 2020 -0700
tree bb4d8194f9464b6b658b3be066fe3152b8be964d
parent a31677dde39747700c0b626a9642315cd542cc73
parent 27ed6ccc12a331a1e6014f2fe101a2c551167e9e

Merge branch 'jk/worktree-check-clean-leakfix'

Leakfix.

* jk/worktree-check-clean-leakfix:
  worktree: fix leak in check_clean_worktree()

builtin/worktree.c

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 378f332..df21469 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -924,7 +924,6 @@
 static void check_clean_worktree(struct worktree *wt,
 				 const char *original_path)
 {
-	struct strvec child_env = STRVEC_INIT;
 	struct child_process cp;
 	char buf[1];
 	int ret;
@@ -935,15 +934,14 @@
 	 */
 	validate_no_submodules(wt);
 
-	strvec_pushf(&child_env, "%s=%s/.git",
+	child_process_init(&cp);
+	strvec_pushf(&cp.env_array, "%s=%s/.git",
 		     GIT_DIR_ENVIRONMENT, wt->path);
-	strvec_pushf(&child_env, "%s=%s",
+	strvec_pushf(&cp.env_array, "%s=%s",
 		     GIT_WORK_TREE_ENVIRONMENT, wt->path);
-	memset(&cp, 0, sizeof(cp));
 	strvec_pushl(&cp.args, "status",
 		     "--porcelain", "--ignore-submodules=none",
 		     NULL);
-	cp.env = child_env.v;
 	cp.git_cmd = 1;
 	cp.dir = wt->path;
 	cp.out = -1;