development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/fmt-merge-msg-leakfix'

Browse source 
Leakfix.

* rs/fmt-merge-msg-leakfix:
  transport-helper: plug strbuf and string_list leaks
This commit is contained in:
Junio C Hamano 2017-12-27 11:16:26 -08:00
parent eacf669cec 176cb979fe
commit 54b1335ae3
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
transport-helper.c
View file

@ -882,7 +882,8 @@ static int push_refs_with_push(struct transport *transport,
struct strbuf cas = STRBUF_INIT; struct strbuf cas = STRBUF_INIT;
strbuf_addf(&cas, "%s:%s", strbuf_addf(&cas, "%s:%s",
ref->name, oid_to_hex(&ref->old_oid_expect)); ref->name, oid_to_hex(&ref->old_oid_expect));
string_list_append(&cas_options, strbuf_detach(&cas, NULL)); string_list_append_nodup(&cas_options,
strbuf_detach(&cas, NULL));
} }
} }
if (buf.len == 0) { if (buf.len == 0) {
@ -897,6 +898,7 @@ static int push_refs_with_push(struct transport *transport,
strbuf_addch(&buf, '\n'); strbuf_addch(&buf, '\n');
sendline(data, &buf); sendline(data, &buf);
strbuf_release(&buf); strbuf_release(&buf);
string_list_clear(&cas_options, 0);
return push_update_refs_status(data, remote_refs, flags); return push_update_refs_status(data, remote_refs, flags);
} }
@ -930,7 +932,8 @@ static int push_refs_with_export(struct transport *transport,
private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name); private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
if (private && !get_oid(private, &oid)) { if (private && !get_oid(private, &oid)) {
strbuf_addf(&buf, "^%s", private); strbuf_addf(&buf, "^%s", private);
string_list_append(&revlist_args, strbuf_detach(&buf, NULL)); string_list_append_nodup(&revlist_args,
strbuf_detach(&buf, NULL));
oidcpy(&ref->old_oid, &oid); oidcpy(&ref->old_oid, &oid);
} }
free(private); free(private);