mirror of
https://github.com/git/git.git
synced 2024-12-11 10:54:21 +08:00
68ffe095a2
transport_get_remote_refs() can populate the transport struct's remote_refs. transport_disconnect() is already responsible for most of transport's cleanup - therefore we also take care of freeing remote_refs there. There are 2 locations where transport_disconnect() is called before we're done using the returned remote_refs. This patch changes those callsites to only call transport_disconnect() after the returned refs are no longer being used - which is necessary to safely be able to free remote_refs during transport_disconnect(). This commit fixes the following leak which was found while running t0000, but is expected to also fix the same pattern of leak in all locations that use transport_get_remote_refs(): Direct leak of 165 byte(s) in 1 object(s) allocated from: #0 0x49a6b2 in calloc /home/abuild/rpmbuild/BUILD/llvm-11.0.0.src/build/../projects/compiler-rt/lib/asan/asan_malloc_linux.cpp:154:3 #1 0x9a72f2 in xcalloc /home/ahunt/oss-fuzz/git/wrapper.c:140:8 #2 0x8ce203 in alloc_ref_with_prefix /home/ahunt/oss-fuzz/git/remote.c:867:20 #3 0x8ce1a2 in alloc_ref /home/ahunt/oss-fuzz/git/remote.c:875:9 #4 0x72f63e in process_ref_v2 /home/ahunt/oss-fuzz/git/connect.c:426:8 #5 0x72f21a in get_remote_refs /home/ahunt/oss-fuzz/git/connect.c:525:8 #6 0x979ab7 in handshake /home/ahunt/oss-fuzz/git/transport.c:305:4 #7 0x97872d in get_refs_via_connect /home/ahunt/oss-fuzz/git/transport.c:339:9 #8 0x9774b5 in transport_get_remote_refs /home/ahunt/oss-fuzz/git/transport.c:1388:4 #9 0x51cf80 in cmd_clone /home/ahunt/oss-fuzz/git/builtin/clone.c:1271:9 #10 0x4cd60d in run_builtin /home/ahunt/oss-fuzz/git/git.c:453:11 #11 0x4cb2da in handle_builtin /home/ahunt/oss-fuzz/git/git.c:704:3 #12 0x4ccc37 in run_argv /home/ahunt/oss-fuzz/git/git.c:771:4 #13 0x4cac29 in cmd_main /home/ahunt/oss-fuzz/git/git.c:902:19 #14 0x69c45e in main /home/ahunt/oss-fuzz/git/common-main.c:52:11 #15 0x7f6a459d5349 in __libc_start_main (/lib64/libc.so.6+0x24349) Signed-off-by: Andrzej Hunt <ajrhunt@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
156 lines
4.3 KiB
C
156 lines
4.3 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "transport.h"
|
|
#include "ref-filter.h"
|
|
#include "remote.h"
|
|
#include "refs.h"
|
|
|
|
static const char * const ls_remote_usage[] = {
|
|
N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
" [-q | --quiet] [--exit-code] [--get-url]\n"
|
|
" [--symref] [<repository> [<refs>...]]"),
|
|
NULL
|
|
};
|
|
|
|
/*
|
|
* Is there one among the list of patterns that match the tail part
|
|
* of the path?
|
|
*/
|
|
static int tail_match(const char **pattern, const char *path)
|
|
{
|
|
const char *p;
|
|
char *pathbuf;
|
|
|
|
if (!pattern)
|
|
return 1; /* no restriction */
|
|
|
|
pathbuf = xstrfmt("/%s", path);
|
|
while ((p = *(pattern++)) != NULL) {
|
|
if (!wildmatch(p, pathbuf, 0)) {
|
|
free(pathbuf);
|
|
return 1;
|
|
}
|
|
}
|
|
free(pathbuf);
|
|
return 0;
|
|
}
|
|
|
|
int cmd_ls_remote(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const char *dest = NULL;
|
|
unsigned flags = 0;
|
|
int get_url = 0;
|
|
int quiet = 0;
|
|
int status = 0;
|
|
int show_symref_target = 0;
|
|
const char *uploadpack = NULL;
|
|
const char **pattern = NULL;
|
|
struct transport_ls_refs_options transport_options =
|
|
TRANSPORT_LS_REFS_OPTIONS_INIT;
|
|
int i;
|
|
struct string_list server_options = STRING_LIST_INIT_DUP;
|
|
|
|
struct remote *remote;
|
|
struct transport *transport;
|
|
const struct ref *ref;
|
|
struct ref_array ref_array;
|
|
static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
|
|
|
|
struct option options[] = {
|
|
OPT__QUIET(&quiet, N_("do not print remote URL")),
|
|
OPT_STRING(0, "upload-pack", &uploadpack, N_("exec"),
|
|
N_("path of git-upload-pack on the remote host")),
|
|
{ OPTION_STRING, 0, "exec", &uploadpack, N_("exec"),
|
|
N_("path of git-upload-pack on the remote host"),
|
|
PARSE_OPT_HIDDEN },
|
|
OPT_BIT('t', "tags", &flags, N_("limit to tags"), REF_TAGS),
|
|
OPT_BIT('h', "heads", &flags, N_("limit to heads"), REF_HEADS),
|
|
OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
|
|
OPT_BOOL(0, "get-url", &get_url,
|
|
N_("take url.<base>.insteadOf into account")),
|
|
OPT_REF_SORT(sorting_tail),
|
|
OPT_SET_INT_F(0, "exit-code", &status,
|
|
N_("exit with exit code 2 if no matching refs are found"),
|
|
2, PARSE_OPT_NOCOMPLETE),
|
|
OPT_BOOL(0, "symref", &show_symref_target,
|
|
N_("show underlying ref in addition to the object pointed by it")),
|
|
OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
|
|
OPT_END()
|
|
};
|
|
|
|
memset(&ref_array, 0, sizeof(ref_array));
|
|
|
|
argc = parse_options(argc, argv, prefix, options, ls_remote_usage,
|
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
|
dest = argv[0];
|
|
|
|
UNLEAK(sorting);
|
|
|
|
if (argc > 1) {
|
|
int i;
|
|
pattern = xcalloc(argc, sizeof(const char *));
|
|
for (i = 1; i < argc; i++) {
|
|
pattern[i - 1] = xstrfmt("*/%s", argv[i]);
|
|
}
|
|
}
|
|
|
|
if (flags & REF_TAGS)
|
|
strvec_push(&transport_options.ref_prefixes, "refs/tags/");
|
|
if (flags & REF_HEADS)
|
|
strvec_push(&transport_options.ref_prefixes, "refs/heads/");
|
|
|
|
remote = remote_get(dest);
|
|
if (!remote) {
|
|
if (dest)
|
|
die("bad repository '%s'", dest);
|
|
die("No remote configured to list refs from.");
|
|
}
|
|
if (!remote->url_nr)
|
|
die("remote %s has no configured URL", dest);
|
|
|
|
if (get_url) {
|
|
printf("%s\n", *remote->url);
|
|
return 0;
|
|
}
|
|
|
|
transport = transport_get(remote, NULL);
|
|
if (uploadpack != NULL)
|
|
transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
|
|
if (server_options.nr)
|
|
transport->server_options = &server_options;
|
|
|
|
ref = transport_get_remote_refs(transport, &transport_options);
|
|
if (ref) {
|
|
int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
|
|
repo_set_hash_algo(the_repository, hash_algo);
|
|
}
|
|
|
|
if (!dest && !quiet)
|
|
fprintf(stderr, "From %s\n", *remote->url);
|
|
for ( ; ref; ref = ref->next) {
|
|
struct ref_array_item *item;
|
|
if (!check_ref_type(ref, flags))
|
|
continue;
|
|
if (!tail_match(pattern, ref->name))
|
|
continue;
|
|
item = ref_array_push(&ref_array, ref->name, &ref->old_oid);
|
|
item->symref = xstrdup_or_null(ref->symref);
|
|
}
|
|
|
|
if (sorting)
|
|
ref_array_sort(sorting, &ref_array);
|
|
|
|
for (i = 0; i < ref_array.nr; i++) {
|
|
const struct ref_array_item *ref = ref_array.items[i];
|
|
if (show_symref_target && ref->symref)
|
|
printf("ref: %s\t%s\n", ref->symref, ref->refname);
|
|
printf("%s\t%s\n", oid_to_hex(&ref->objectname), ref->refname);
|
|
status = 0; /* we found something */
|
|
}
|
|
|
|
ref_array_clear(&ref_array);
|
|
if (transport_disconnect(transport))
|
|
return 1;
|
|
return status;
|
|
}
|