mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/ls-remote: fix leaking pattern strings

Browse Source 
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.

Refactor the code to use a `struct strvec` instead of manually tracking
the strings in an array. Like this, we can easily use `strvec_clear()`
to release both the vector and the contained string for us, plugging the
leak.

Helped-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-08-01 12:40:02 +02:00
committed by Junio C Hamano
parent 6771e2012e
commit 4119fc08e2
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
builtin/ls-remote.c
View File

@ -19,17 +19,16 @@ static const char * const ls_remote_usage[] = {
* Is there one among the list of patterns that match the tail part * Is there one among the list of patterns that match the tail part
* of the path? * of the path?
*/ */
static int tail_match(const char **pattern, const char *path) static int tail_match(const struct strvec *pattern, const char *path)
{ {
const char *p;
char *pathbuf; char *pathbuf;
if (!pattern) if (!pattern->nr)
return 1; /* no restriction */ return 1; /* no restriction */
pathbuf = xstrfmt("/%s", path); pathbuf = xstrfmt("/%s", path);
while ((p = *(pattern++)) != NULL) { for (size_t i = 0; i < pattern->nr; i++) {
if (!wildmatch(p, pathbuf, 0)) { if (!wildmatch(pattern->v[i], pathbuf, 0)) {
free(pathbuf); free(pathbuf);
return 1; return 1;
} }
@ -47,7 +46,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
int status = 0; int status = 0;
int show_symref_target = 0; int show_symref_target = 0;
const char *uploadpack = NULL; const char *uploadpack = NULL;
const char **pattern = NULL; struct strvec pattern = STRVEC_INIT;
struct transport_ls_refs_options transport_options = struct transport_ls_refs_options transport_options =
TRANSPORT_LS_REFS_OPTIONS_INIT; TRANSPORT_LS_REFS_OPTIONS_INIT;
int i; int i;
@ -93,13 +92,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
packet_trace_identity("ls-remote"); packet_trace_identity("ls-remote");
if (argc > 1) { for (int i = 1; i < argc; i++)
int i; strvec_pushf(&pattern, "*/%s", argv[i]);
CALLOC_ARRAY(pattern, argc);
for (i = 1; i < argc; i++) {
pattern[i - 1] = xstrfmt("*/%s", argv[i]);
}
}
if (flags & REF_TAGS) if (flags & REF_TAGS)
strvec_push(&transport_options.ref_prefixes, "refs/tags/"); strvec_push(&transport_options.ref_prefixes, "refs/tags/");
@ -136,7 +130,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
struct ref_array_item *item; struct ref_array_item *item;
if (!check_ref_type(ref, flags)) if (!check_ref_type(ref, flags))
continue; continue;
if (!tail_match(pattern, ref->name)) if (!tail_match(&pattern, ref->name))
continue; continue;
item = ref_array_push(&ref_array, ref->name, &ref->old_oid); item = ref_array_push(&ref_array, ref->name, &ref->old_oid);
item->symref = xstrdup_or_null(ref->symref); item->symref = xstrdup_or_null(ref->symref);
@ -158,5 +152,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
if (transport_disconnect(transport)) if (transport_disconnect(transport))
status = 1; status = 1;
transport_ls_refs_options_release(&transport_options); transport_ls_refs_options_release(&transport_options);
strvec_clear(&pattern);
return status; return status;
} }

1
t/t5535-fetch-push-symref.sh
View File

@ -2,6 +2,7 @@
test_description='avoiding conflicting update through symref aliasing' test_description='avoiding conflicting update through symref aliasing'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
test_expect_success 'setup' ' test_expect_success 'setup' '