[PATCH 08/23] builtin/ls-remote: fix leaking `pattern` strings
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jul 26, 2024, 12:15 UTC
- Message-ID
- <d42152654bf91e90b8b417316f255746a3a75155.1721995576.git.ps@pks.im>
- In-Reply-To
- <cover.1721995576.git.ps@pks.im>
Users can pass patterns to git-ls-remote(1), which allows them to filter the list of printed references. We assemble those patterns into an array and prefix them with "*/", but never free either the array nor the allocated strings.
Fix those leaks.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- builtin/ls-remote.c | 11 +++++++---- t/t5535-fetch-push-symref.sh | 1 + 2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index debf2d4f88..500f76fe4c 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -47,7 +47,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) int status = 0; int show_symref_target = 0; const char *uploadpack = NULL; - const char **pattern = NULL; + char **pattern = NULL; struct transport_ls_refs_options transport_options = TRANSPORT_LS_REFS_OPTIONS_INIT; int i; @@ -96,9 +96,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) if (argc > 1) { int i; CALLOC_ARRAY(pattern, argc); - for (i = 1; i < argc; i++) { + for (i = 1; i < argc; i++) pattern[i - 1] = xstrfmt("*/%s", argv[i]); - } } if (flags & REF_TAGS) @@ -136,7 +135,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) struct ref_array_item *item; if (!check_ref_type(ref, flags)) continue; - if (!tail_match(pattern, ref->name)) + if (!tail_match((const char **) pattern, ref->name)) continue; item = ref_array_push(&ref_array, ref->name, &ref->old_oid); item->symref = xstrdup_or_null(ref->symref); @@ -158,5 +157,9 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) if (transport_disconnect(transport)) status = 1; transport_ls_refs_options_release(&transport_options); + + for (i = 1; i < argc; i++) + free(pattern[i - 1]); + free(pattern); return status; } diff --git a/t/t5535-fetch-push-symref.sh b/t/t5535-fetch-push-symref.sh index e8f6d233ff..7122af7fdb 100755 --- a/t/t5535-fetch-push-symref.sh +++ b/t/t5535-fetch-push-symref.sh @@ -2,6 +2,7 @@ test_description='avoiding conflicting update through symref aliasing' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh test_expect_success 'setup' '
-- 2.46.0.rc1.dirty