| Message ID | patch-01.11-f1c847ad613-20220713T131601Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | bc57ba1d54f3133cd46481532d97a8346b62d8aa |
| Headers | show |
| Series | submodule--helper: fix memory leaks | expand |
diff --git a/submodule.c b/submodule.c index 2af16c647d5..3fa5db3ecdf 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);
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 <avarab@gmail.com> --- submodule.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)