From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 31 Aug 2022 23:14:11 +0000 (+0200)
Subject: submodule--helper: "struct pathspec" memory leak in module_update()
X-Git-Tag: v2.38.0-rc0~7^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b9d12460d18d02bf6f12cc3c96340e53acf03e3;p=thirdparty%2Fgit.git

submodule--helper: "struct pathspec" memory leak in module_update()

The module_update() function calls module_list_compute() twice, which
in turn will reset the "struct pathspec" passed to it. Let's instead
track two of them, and clear them both.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 4bba1c7561..ef56471a8c 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -2561,6 +2561,7 @@ cleanup:
 static int module_update(int argc, const char **argv, const char *prefix)
 {
 	struct pathspec pathspec = { 0 };
+	struct pathspec pathspec2 = { 0 };
 	struct update_data opt = UPDATE_DATA_INIT;
 	struct list_objects_filter_options filter_options = { 0 };
 	int ret;
@@ -2649,7 +2650,7 @@ static int module_update(int argc, const char **argv, const char *prefix)
 		struct init_cb info = INIT_CB_INIT;
 
 		if (module_list_compute(argc, argv, opt.prefix,
-					&pathspec, &list) < 0) {
+					&pathspec2, &list) < 0) {
 			ret = 1;
 			goto cleanup;
 		}
@@ -2672,6 +2673,7 @@ static int module_update(int argc, const char **argv, const char *prefix)
 cleanup:
 	list_objects_filter_release(&filter_options);
 	clear_pathspec(&pathspec);
+	clear_pathspec(&pathspec2);
 	return ret;
 }