From: Ævar Arnfjörð Bjarmason Date: Fri, 1 Jul 2022 10:42:52 +0000 (+0200) Subject: submodule.c: free() memory from xgetcwd() X-Git-Tag: v2.38.0-rc0~155^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc57ba1d54f3133cd46481532d97a8346b62d8aa;p=thirdparty%2Fgit.git submodule.c: free() memory from xgetcwd() Fix a memory leak in code added in bf0231c6614 (rev-parse: add --show-superproject-working-tree, 2017-03-08), we should never have made the result of xgetcwd() a "const char *", as we return a strbuf_detach()'d value. Let's fix that and free() it when we're done with it. We can't mark any tests passing passing with SANITIZE=leak using "TEST_PASSES_SANITIZE_LEAK=true" as a result of this change, but e.g. "t/t1500-rev-parse.sh" now gets closer to passing. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/submodule.c b/submodule.c index 4e299f578f..06073b2e7b 100644 --- a/submodule.c +++ b/submodule.c @@ -2388,7 +2388,7 @@ int get_superproject_working_tree(struct strbuf *buf) struct child_process cp = CHILD_PROCESS_INIT; struct strbuf sb = STRBUF_INIT; struct strbuf one_up = STRBUF_INIT; - const char *cwd = xgetcwd(); + char *cwd = xgetcwd(); int ret = 0; const char *subpath; int code; @@ -2451,6 +2451,7 @@ int get_superproject_working_tree(struct strbuf *buf) ret = 1; free(super_wt); } + free(cwd); strbuf_release(&sb); code = finish_command(&cp);