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

remote: plug memory leaks at early returns

Browse Source 
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2024-08-23 22:21:10 +02:00
committed by Junio C Hamano
parent 6a09c36371
commit 4e7aa344f2
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
builtin/remote.c
View File

@ -164,6 +164,7 @@ static int add(int argc, const char **argv, const char *prefix)
struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT; struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
const char *name, *url; const char *name, *url;
int i; int i;
int result = 0;
struct option options[] = { struct option options[] = {
OPT_BOOL('f', "fetch", &fetch, N_("fetch the remote branches")), OPT_BOOL('f', "fetch", &fetch, N_("fetch the remote branches")),
@ -230,8 +231,10 @@ static int add(int argc, const char **argv, const char *prefix)
fetch_tags == TAGS_SET ? "--tags" : "--no-tags"); fetch_tags == TAGS_SET ? "--tags" : "--no-tags");
} }
if (fetch && fetch_remote(name)) if (fetch && fetch_remote(name)) {
return 1; result = 1;
goto out;
}
if (master) { if (master) {
strbuf_reset(&buf); strbuf_reset(&buf);
@ -241,14 +244,15 @@ static int add(int argc, const char **argv, const char *prefix)
strbuf_addf(&buf2, "refs/remotes/%s/%s", name, master); strbuf_addf(&buf2, "refs/remotes/%s/%s", name, master);
if (refs_update_symref(get_main_ref_store(the_repository), buf.buf, buf2.buf, "remote add")) if (refs_update_symref(get_main_ref_store(the_repository), buf.buf, buf2.buf, "remote add"))
return error(_("Could not setup master '%s'"), master); result = error(_("Could not setup master '%s'"), master);
} }
out:
strbuf_release(&buf); strbuf_release(&buf);
strbuf_release(&buf2); strbuf_release(&buf2);
string_list_clear(&track, 0); string_list_clear(&track, 0);
return 0; return result;
} }
struct branch_info { struct branch_info {
@ -715,6 +719,7 @@ static int mv(int argc, const char **argv, const char *prefix)
struct rename_info rename; struct rename_info rename;
int i, refs_renamed_nr = 0, refspec_updated = 0; int i, refs_renamed_nr = 0, refspec_updated = 0;
struct progress *progress = NULL; struct progress *progress = NULL;
int result = 0;
argc = parse_options(argc, argv, prefix, options, argc = parse_options(argc, argv, prefix, options,
builtin_remote_rename_usage, 0); builtin_remote_rename_usage, 0);
@ -747,9 +752,11 @@ static int mv(int argc, const char **argv, const char *prefix)
strbuf_addf(&buf, "remote.%s", rename.old_name); strbuf_addf(&buf, "remote.%s", rename.old_name);
strbuf_addf(&buf2, "remote.%s", rename.new_name); strbuf_addf(&buf2, "remote.%s", rename.new_name);
if (repo_config_rename_section(the_repository, buf.buf, buf2.buf) < 1) if (repo_config_rename_section(the_repository, buf.buf, buf2.buf) < 1) {
return error(_("Could not rename config section '%s' to '%s'"), result = error(_("Could not rename config section '%s' to '%s'"),
buf.buf, buf2.buf); buf.buf, buf2.buf);
goto out;
}
if (oldremote->fetch.raw_nr) { if (oldremote->fetch.raw_nr) {
strbuf_reset(&buf); strbuf_reset(&buf);
@ -870,7 +877,7 @@ out:
strbuf_release(&buf); strbuf_release(&buf);
strbuf_release(&buf2); strbuf_release(&buf2);
strbuf_release(&buf3); strbuf_release(&buf3);
return 0; return result;
} }
static int rm(int argc, const char **argv, const char *prefix) static int rm(int argc, const char **argv, const char *prefix)